Skip to content

Commit

Permalink
www/elinks: Fix build with ssl from ports
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
Zirias committed Sep 20, 2023
1 parent 71f0f86 commit 9de718a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
1 change: 1 addition & 0 deletions www/elinks/Makefile
Expand Up @@ -117,6 +117,7 @@ ZSTD_USES= localbase
ZSTD_MESON_TRUE= zstd

post-patch:
@${REINPLACE_CMD} -e 's|%%OPENSSLLIB%%|${OPENSSLLIB}|g' ${WRKSRC}/meson.build
@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|g' ${WRKSRC}/doc/tools/help2xml
@${REINPLACE_CMD} -e 's|/usr/bin/env python3|${PYTHON_CMD}|g' ${WRKSRC}/doc/tools/asciidoc/asciidoc.py

Expand Down
17 changes: 14 additions & 3 deletions www/elinks/files/patch-meson.build
@@ -1,6 +1,6 @@
--- meson.build.orig 2023-05-01 08:45:22 UTC
+++ meson.build
@@ -178,6 +178,10 @@ endif
@@ -178,6 +178,10 @@ if compiler.has_header('fcntl.h')
conf_data.set('HAVE_FCNTL_H', 1)
endif

Expand All @@ -11,7 +11,18 @@
if compiler.has_header('libgen.h')
conf_data.set('HAVE_LIBGEN_H', 1)
endif
@@ -845,7 +849,7 @@ 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

Expand All @@ -20,7 +31,7 @@
conf_data.set('HAVE_ALLOCA', 1)
endif

@@ -861,7 +865,7 @@ 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

Expand Down

0 comments on commit 9de718a

Please sign in to comment.