From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D6AFB158013 for ; Thu, 14 Dec 2023 04:12:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B68322BC048; Thu, 14 Dec 2023 04:12:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 988F62BC04A for ; Thu, 14 Dec 2023 04:12:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DF28033FECD for ; Thu, 14 Dec 2023 04:12:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5D48E14C4 for ; Thu, 14 Dec 2023 04:12:28 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1702520121.505c020a9c8f7fa29e69533259cf6acd8a83917e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libdnet/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libdnet/libdnet-1.16.4.ebuild dev-libs/libdnet/libdnet-1.17.0.ebuild X-VCS-Directories: dev-libs/libdnet/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 505c020a9c8f7fa29e69533259cf6acd8a83917e X-VCS-Branch: master Date: Thu, 14 Dec 2023 04:12:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 22b792bd-4ce8-441a-a86c-d6702d651f39 X-Archives-Hash: 4a13dd2ba4438c6e5a3cc99fe6130747 commit: 505c020a9c8f7fa29e69533259cf6acd8a83917e Author: Matoro Mahri matoro tk> AuthorDate: Wed Dec 13 19:20:34 2023 +0000 Commit: Sam James gentoo org> CommitDate: Thu Dec 14 02:15:21 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=505c020a dev-libs/libdnet: fix lookup path for libcheck.so on 64-bit We pass --with-check=/usr, and the configure file is hardcoded to look for /lib/libcheck.so (we already replace libcheck.a with libcheck.so). Adjust this path so it uses lib64 on 64-bit. Bug: https://bugs.gentoo.org/852122 Bug: https://bugs.gentoo.org/907224 Bug: https://bugs.gentoo.org/913838 Signed-off-by: Matoro Mahri matoro.tk> Closes: https://github.com/gentoo/gentoo/pull/34271 Signed-off-by: Sam James gentoo.org> dev-libs/libdnet/libdnet-1.16.4.ebuild | 3 +++ dev-libs/libdnet/libdnet-1.17.0.ebuild | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dev-libs/libdnet/libdnet-1.16.4.ebuild b/dev-libs/libdnet/libdnet-1.16.4.ebuild index 5c7bf03fe257..fddf3434d1d8 100644 --- a/dev-libs/libdnet/libdnet-1.16.4.ebuild +++ b/dev-libs/libdnet/libdnet-1.16.4.ebuild @@ -35,6 +35,9 @@ src_prepare() { sed -i \ -e 's/libcheck.a/libcheck.so/g' \ configure.ac || die + sed -i \ + -e "s/lib\/libcheck/$(get_libdir)\/libcheck/g" \ + configure.ac || die sed -i \ -e 's|-L$libdir ||g' \ dnet-config.in || die diff --git a/dev-libs/libdnet/libdnet-1.17.0.ebuild b/dev-libs/libdnet/libdnet-1.17.0.ebuild index 9114d6529375..6375fca7a56c 100644 --- a/dev-libs/libdnet/libdnet-1.17.0.ebuild +++ b/dev-libs/libdnet/libdnet-1.17.0.ebuild @@ -39,6 +39,9 @@ src_prepare() { sed -i \ -e 's/libcheck.a/libcheck.so/g' \ configure.ac || die + sed -i \ + -e "s/lib\/libcheck/$(get_libdir)\/libcheck/g" \ + configure.ac || die sed -i \ -e 's|-L$libdir ||g' \ dnet-config.in || die