pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Even though cmake probes for and fails to find gnutls and gcrypt, it still ends up trying to use them. Use CMAKE_ARGS to convince cmake to not use them - which should achieve what ZM_SSL_LIB=openssl did for us under configure (albeit in a more fragile, hacky and undocumented way - thanks cmake)



Module Name:	pkgsrc-wip
Committed By:	davidsainty <david.sainty%gmail.com@localhost>
Pushed By:	dsainty
Date:		Sat Jan 15 15:52:27 2022 +1300
Changeset:	f5487bb39aa3c121d3770545ed2f91c25afcc73d

Modified Files:
	zoneminder/Makefile

Log Message:
Even though cmake probes for and fails to find gnutls and gcrypt, it still ends up trying to use them.  Use CMAKE_ARGS to convince cmake to not use them - which should achieve what ZM_SSL_LIB=openssl did for us under configure (albeit in a more fragile, hacky and undocumented way - thanks cmake)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f5487bb39aa3c121d3770545ed2f91c25afcc73d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 zoneminder/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diffs:
diff --git a/zoneminder/Makefile b/zoneminder/Makefile
index 0cfec511ea..20d004556d 100644
--- a/zoneminder/Makefile
+++ b/zoneminder/Makefile
@@ -123,6 +123,10 @@ CFLAGS+=		-D__STDC_CONSTANT_MACROS
 # Since MySQL uses openssl, use the same library instead of defaulting to
 # gnutls.
 CONFIGURE_ENV+=		ZM_SSL_LIB=openssl
+CMAKE_ARGS+=		-DGNUTLS_LIBRARIES=""
+
+# Make sure cmake doesn't think libgcrypt is available (We have OpenSSL)
+CMAKE_ARGS+=		-DGCRYPT_LIBRARIES=""
 
 # Control where run-time state (PID file and sockets) get stored.
 # Default is "/var/run/zm", but we want to conform to VARBASE.


Home | Main Index | Thread Index | Old Index