Date: Wed, 20 Sep 2023 07:44:35 GMT From: Felix Palmen <zirias@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 71f0f861cedf - main - irc/irssi: Fix build with ssl from ports Message-ID: <202309200744.38K7iZw6019820@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=71f0f861cedf2a7ddcc0cc4909fc01f630453da8 commit 71f0f861cedf2a7ddcc0cc4909fc01f630453da8 Author: Felix Palmen <zirias@FreeBSD.org> AuthorDate: 2023-09-20 06:36:27 +0000 Commit: Felix Palmen <zirias@FreeBSD.org> CommitDate: 2023-09-20 07:43:32 +0000 irc/irssi: Fix build with ssl from ports 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) --- irc/irssi/Makefile | 3 +++ irc/irssi/files/patch-meson.build | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile index db30aedfa747..b3db9f3aa2ae 100644 --- a/irc/irssi/Makefile +++ b/irc/irssi/Makefile @@ -41,6 +41,9 @@ UTF8PROC_MESON_NO= disable-utf8proc PERL_USE_OFF= perl5=build +post-patch: + @${REINPLACE_CMD} 's|%%OPENSSLLIB%%|${OPENSSLLIB}|' ${WRKSRC}/meson.build + post-install-PERL-off: @${RM} -r ${STAGEDIR}${DATADIR}/scripts diff --git a/irc/irssi/files/patch-meson.build b/irc/irssi/files/patch-meson.build new file mode 100644 index 000000000000..722b7a6da6d2 --- /dev/null +++ b/irc/irssi/files/patch-meson.build @@ -0,0 +1,12 @@ +--- meson.build.orig 2023-03-28 12:13:26 UTC ++++ meson.build +@@ -284,7 +284,8 @@ if glib_internal and want_static_dependency and want_f + else + openssl_dep = dependency('openssl', static : want_static_dependency, include_type : 'system') + endif +-dep += openssl_dep ++dep += cc.find_library('crypto', dirs: '%%OPENSSLLIB%%') ++dep += cc.find_library('ssl', dirs: '%%OPENSSLLIB%%') + + ############ + # utf8proc #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309200744.38K7iZw6019820>