From nobody Wed Sep 20 07:44:35 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rr9Xg3T3hz4tGPc; Wed, 20 Sep 2023 07:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rr9Xg2JJ8z3fRg; Wed, 20 Sep 2023 07:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695195875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c4ypuryxjEM8baJBJedCZGNeFosNVuDblniRJ1GwoKI=; b=pRg1zI/OX17SkDJqmEjB9hMK5RaIGgjftWZ+d/Op0x4ATNmxy23Y100E/HR5H/zzexFMro HFdZx1v8/yuORUg5CPLFdRyDAV4f3ugoY/DB//KM7VsP6tsu64j9M7hEF0hDDh1kyFzJHZ tpCG8zys532V5wMJAEFUOtATgRbgbCsQ+qsTLHfZWwXXdGLhO7CLm+IveB3KYNGqBsZjcY z0+P9+jIRXIPvOsTWfIblu8n4DKd7qOUgJYjGvqGLQsNTeErD7kuO55KfhC/8BmaK4YLIw FGnGx+HHxX2GbSoYsY9Kbs8ARt/c36uhuxrvoX+wOqvL9e+WLDt67alLK5X2iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695195875; a=rsa-sha256; cv=none; b=bZagnvshjZxrDguSiZYi8UozwE13PkL2xBV5L8rci9e6J4ZZZVr/sjcMHvFIM52vF7LCRm pDCZZyi5jz26ZchnAOJk2dBJoDXlbWHJNMPWiUJoiLbZGiPpN1ybgBu6PCx2vHBbB1PtZ8 PLL/04tW1KzhZyz2nNYRIDWKH67BUwAotPM53PYubBgpLQ7CobaxM4VcczWkfGnwt0XAxJ aMEb/cGIn+v7r4OYRiaHm2dgoJsyKlDLy7+2vGzCDZwChhtGLoIFa1T8PynDW9GgEOgJ9M twYE7r2Bupii0KdcDRWHWOi5gmKP/iRaeJ5ubAJkEK4VPQclkGWa4YtubOJxTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695195875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c4ypuryxjEM8baJBJedCZGNeFosNVuDblniRJ1GwoKI=; b=CjjF/Pa4S/EGCCXHF+Nmmyt0W+7bpj1TzyGhXcybQv6nY5sFJQetgdVhNG9xjo6Qv3zm+U gfpKWnwlPm7tKJHgzMM+1opCJB2pjzaG5PNgp83eSbbdmiGNl6wBTKmbtikoWYSZO0MG5v 0pwUUeE43GWrbelz8WhyTlhv9iOhxGvYavOWUWUTwlJevDPeRxbRNYQ7nhe+bXgqWBNHsg cxIs39N6kH8ZMLhMxFs4LLsu9JwRYWhg4tYBcQ+Z8ZbeIPkzfEmAnwylJxvqiIHWWeTFpm luEtTDt2DoxfvzePF92jsigIyTndQgrcTt94geVLBN/tHKCnsxpoDwaQFdHu5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rr9Xg1LGmznTk; Wed, 20 Sep 2023 07:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38K7iZoS019823; Wed, 20 Sep 2023 07:44:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38K7iZw6019820; Wed, 20 Sep 2023 07:44:35 GMT (envelope-from git) Date: Wed, 20 Sep 2023 07:44:35 GMT Message-Id: <202309200744.38K7iZw6019820@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: 71f0f861cedf - main - irc/irssi: Fix build with ssl from ports List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 71f0f861cedf2a7ddcc0cc4909fc01f630453da8 Auto-Submitted: auto-generated The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=71f0f861cedf2a7ddcc0cc4909fc01f630453da8 commit 71f0f861cedf2a7ddcc0cc4909fc01f630453da8 Author: Felix Palmen AuthorDate: 2023-09-20 06:36:27 +0000 Commit: Felix Palmen 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 #