mirror of
https://git.freebsd.org/ports.git
synced 2025-06-30 09:00:33 -04:00
9de718aaf7
Building with ssl from ports used the headers from ports, but still
linked the libs from base and therefore failed. Patch meson.build to
look for OpenSSL libs in ${OPENSSLLIB} to fix this.
Approved by: portmgr (blanket, build fix)
42 lines
1.4 KiB
Text
42 lines
1.4 KiB
Text
--- meson.build.orig 2023-05-01 08:45:22 UTC
|
|
+++ meson.build
|
|
@@ -178,6 +178,10 @@ if compiler.has_header('fcntl.h')
|
|
conf_data.set('HAVE_FCNTL_H', 1)
|
|
endif
|
|
|
|
+if compiler.has_header('execinfo.h')
|
|
+ conf_data.set('HAVE_EXECINFO_H', 1)
|
|
+endif
|
|
+
|
|
if compiler.has_header('libgen.h')
|
|
conf_data.set('HAVE_LIBGEN_H', 1)
|
|
endif
|
|
@@ -344,8 +348,8 @@ gnutlsdeps = []
|
|
ssldeps = []
|
|
|
|
if conf_data.get('CONFIG_OPENSSL')
|
|
- ssldeps = dependency('openssl', static: st)
|
|
- deps += ssldeps
|
|
+ deps += compiler.find_library('crypto', dirs: '%%OPENSSLLIB%%')
|
|
+ deps += compiler.find_library('ssl', dirs: '%%OPENSSLLIB%%')
|
|
conf_data.set('USE_OPENSSL', true)
|
|
conf_data.set('CONFIG_GNUTLS', false)
|
|
elif conf_data.get('CONFIG_GNUTLS')
|
|
@@ -845,7 +849,7 @@ if compiler.has_function('iconv', prefix: '#include <i
|
|
conf_data.set('HAVE_ICONV', 1)
|
|
endif
|
|
|
|
-if conf_data.get('CONFIG_OS_DOS') or compiler.has_function('alloca', prefix: '#include <alloca.h>')
|
|
+if conf_data.get('CONFIG_OS_DOS') or compiler.has_function('alloca', prefix: '#include <stdlib.h>')
|
|
conf_data.set('HAVE_ALLOCA', 1)
|
|
endif
|
|
|
|
@@ -861,7 +865,7 @@ if compiler.has_function('gnutls_certificate_set_x509_
|
|
conf_data.set('HAVE_GNUTLS_CERTIFICATE_SET_X509_SYSTEM_TRUST', 1)
|
|
endif
|
|
|
|
-if compiler.has_function('mkstemps', prefix: '#include <stdlib.h>', args: '-D_GNU_SOURCE')
|
|
+if compiler.has_function('mkstemps', prefix: '#include <unistd.h>')
|
|
conf_data.set('HAVE_MKSTEMPS', 1)
|
|
endif
|
|
|