public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libdnet/
Date: Thu, 14 Dec 2023 04:12:28 +0000 (UTC)	[thread overview]
Message-ID: <1702520121.505c020a9c8f7fa29e69533259cf6acd8a83917e.sam@gentoo> (raw)

commit:     505c020a9c8f7fa29e69533259cf6acd8a83917e
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Wed Dec 13 19:20:34 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <path>/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_gentoo <AT> matoro.tk>
Closes: https://github.com/gentoo/gentoo/pull/34271
Signed-off-by: Sam James <sam <AT> 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


             reply	other threads:[~2023-12-14  4:12 UTC|newest]

Thread overview: 72+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-14  4:12 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-05-28 17:17 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libdnet/ Sam James
2025-04-26 12:59 Arthur Zamarin
2025-04-26  6:06 Arthur Zamarin
2025-03-22 20:06 Michał Górny
2024-09-23  9:14 Arthur Zamarin
2024-05-28 12:04 Michał Górny
2024-05-28 12:04 Michał Górny
2024-05-28 12:04 Michał Górny
2024-05-12 12:29 Conrad Kostecki
2024-04-29  7:51 Jakov Smolić
2024-04-29  7:51 Jakov Smolić
2024-03-23 20:27 Sam James
2024-03-23 20:25 Arthur Zamarin
2024-03-23 20:24 Arthur Zamarin
2024-03-23 18:11 Sam James
2024-03-08 16:47 Sam James
2024-01-17  5:50 Sam James
2024-01-17  5:47 Sam James
2023-10-13 15:00 Sam James
2023-09-21 20:11 Sam James
2023-09-08  9:29 Sam James
2023-09-07 20:53 Sam James
2023-06-01  6:43 Sam James
2023-05-05 10:35 Arthur Zamarin
2023-05-02 19:26 Arthur Zamarin
2023-05-02 19:25 Arthur Zamarin
2023-05-02 19:25 Arthur Zamarin
2023-05-02 19:24 Arthur Zamarin
2023-05-02 19:24 Arthur Zamarin
2023-05-01 18:13 Sam James
2023-04-07 11:12 Sam James
2023-03-30 17:25 Arthur Zamarin
2023-03-30 17:23 Arthur Zamarin
2023-03-30 17:23 Arthur Zamarin
2023-03-30 17:23 Arthur Zamarin
2023-03-30 17:21 Arthur Zamarin
2023-03-15 18:44 Arthur Zamarin
2022-05-16 19:57 Sam James
2021-10-27  6:48 Arthur Zamarin
2021-07-16  1:31 Yixun Lan
2021-02-17 23:40 Sam James
2021-02-16 12:34 Sam James
2021-02-12 13:47 Sam James
2021-02-12  9:55 Sam James
2021-02-07  8:59 Sam James
2021-01-12 23:34 Sam James
2021-01-07  4:10 Sam James
2021-01-07  4:10 Sam James
2021-01-07  4:10 Sam James
2021-01-07  4:10 Sam James
2020-12-27  5:40 Sam James
2020-10-13 15:49 Michał Górny
2020-10-13 10:01 Agostino Sarubbo
2020-10-11 15:39 Sam James
2020-10-11  9:00 Sergei Trofimovich
2020-10-11  8:57 Sergei Trofimovich
2020-10-10 13:43 Sergei Trofimovich
2020-10-10  8:47 Sergei Trofimovich
2020-09-26 21:34 Sergei Trofimovich
2020-09-26  9:20 Jeroen Roovers
2020-09-24  6:59 Agostino Sarubbo
2020-09-24  6:46 Agostino Sarubbo
2020-09-23 10:32 Agostino Sarubbo
2020-09-23 10:29 Agostino Sarubbo
2020-09-23 10:24 Agostino Sarubbo
2020-09-19 20:53 Sam James
2020-09-10  5:37 Jeroen Roovers
2020-08-02 15:07 Jeroen Roovers
2020-08-02 15:07 Jeroen Roovers
2019-02-16  9:24 Jeroen Roovers
2015-09-01 19:08 Tobias Klausmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1702520121.505c020a9c8f7fa29e69533259cf6acd8a83917e.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox