mirror of
https://git.freebsd.org/ports.git
synced 2025-06-07 05:40:30 -04:00
07d4135a6d
libspice-server uses autotools and utilizes PKG_CHECK_MODULES to get openssl CFLAGS and LDFLAGS. However, as we support various openssl flavors, including openssl from base that lacks pkg-config file, we explicitly pass OPENSSL_LIBS and OPENSSL_CFLAGS via CONFIGURE_ENV, however, libspice-server still adds 'openssl' package to Requires.private of its .pc file. This causes a problem for software that requires libspice-server, because e.g. when using openssl from base, detection will fail because .pc file is listing non-existent 'openssl' package. To fix that, update libspice-server's configure.ac to add 'openssl' to Requires.private only if OPENSSL_LIBS and OPENSSL_CFLAGS wasn't explicitly specified by user, otherwise omit 'openssl' and just add the value of OPENSSL_LIBS to Libs.private. While here, add 'amd64' to list of x86_64 cpus so it don't show a warning. Also, drop RUN_DEPENDS on spice-protocol as this is basically a set of headers and it's not required in runtime. Reviewed by: maintainer Differential Revision: https://reviews.freebsd.org/D13896
31 lines
966 B
Text
31 lines
966 B
Text
--- configure.ac.orig 2018-01-13 04:00:56 UTC
|
|
+++ configure.ac
|
|
@@ -62,7 +62,7 @@ AC_SUBST(SPICE_LT_VERSION)
|
|
|
|
# Check for the CPU we are using
|
|
case $host_cpu in
|
|
- x86_64)
|
|
+ x86_64|amd64)
|
|
;;
|
|
*)
|
|
SPICE_WARNING([spice-server on non-x86_64 architectures has not been extensively tested])
|
|
@@ -186,10 +186,18 @@ if test "x$enable_celt051" = "xyes"; then
|
|
AS_VAR_APPEND([SPICE_REQUIRES], [" celt051 >= $CELT051_REQUIRED"]))
|
|
fi
|
|
|
|
+OPENSSL_PKGCONF_USED=1
|
|
+if test -n "${OPENSSL_LIBS}" || test -n "${OPENSSL_CFLAGS}"; then
|
|
+ OPENSSL_PKGCONF_USED=0
|
|
+fi
|
|
PKG_CHECK_MODULES(SSL, openssl)
|
|
AC_SUBST(SSL_CFLAGS)
|
|
AC_SUBST(SSL_LIBS)
|
|
-AS_VAR_APPEND([SPICE_REQUIRES], [" openssl"])
|
|
+if test "{OPENSSL_PKGCONF_USED}" = 1; then
|
|
+ AS_VAR_APPEND([SPICE_REQUIRES], [" openssl"])
|
|
+else
|
|
+ AS_VAR_APPEND([SPICE_NONPKGCONFIG_LIBS], [" $SSL_LIBS"])
|
|
+fi
|
|
|
|
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
|
|
AC_MSG_CHECKING([for jpeglib.h])
|