git: 4c0ac6f6d1e1 - main - www/elinks: Revert build-fix with ssl from ports
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 16 Mar 2024 08:04:31 UTC
The branch main has been updated by zirias:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4c0ac6f6d1e1199df4faec6df61086851c2ae814
commit 4c0ac6f6d1e1199df4faec6df61086851c2ae814
Author: Felix Palmen <zirias@FreeBSD.org>
AuthorDate: 2024-03-16 06:49:09 +0000
Commit: Felix Palmen <zirias@FreeBSD.org>
CommitDate: 2024-03-16 08:03:50 +0000
www/elinks: Revert build-fix with ssl from ports
The build fix was only needed for breakage caused by pkgconf which has
meanwhile been fixed.
This reverts commit 9de718aaf747cace995ffcf592edf64e3fdd9317.
---
www/elinks/files/patch-meson.build | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/www/elinks/files/patch-meson.build b/www/elinks/files/patch-meson.build
index b85b42c91d52..3785cea7bae0 100644
--- a/www/elinks/files/patch-meson.build
+++ b/www/elinks/files/patch-meson.build
@@ -11,16 +11,6 @@
if compiler.has_header('libgen.h')
conf_data.set('HAVE_LIBGEN_H', 1)
endif
-@@ -396,7 +400,8 @@ if conf_data.get('CONFIG_OPENSSL')
- if conf_data.get('CONFIG_OPENSSL')
- ssldeps = dependency('openssl', static: st, required: false)
- if not ssldeps.found()
-- ssldeps = compiler.find_library('ssl', static: st, dirs: [get_option('prefix')+'/lib', '/usr/local/lib'])
-+ ssldeps = compiler.find_library('crypto', static: st, dirs: [get_option('prefix')+'/lib', '/usr/local/lib'])
-+ ssldeps += compiler.find_library('ssl', static: st, dirs: [get_option('prefix')+'/lib', '/usr/local/lib'])
- endif
- deps += ssldeps
- conf_data.set('USE_OPENSSL', true)
@@ -959,7 +964,7 @@ endif
conf_data.set('HAVE_ICONV', 1)
endif