public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libtomcrypt/
Date: Fri, 12 Jan 2024 15:11:31 +0000 (UTC)	[thread overview]
Message-ID: <1705072289.c1863cfc833846a75595a25442d2ad191716a798.grobian@gentoo> (raw)

commit:     c1863cfc833846a75595a25442d2ad191716a798
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 15:09:48 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 15:11:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1863cfc

dev-libs/libtomcrypt: unbreak on Darwin

We force LIBTOOL to libtool, assuming it is a script bash can execute,
but on Darwin -- historically -- libtool is a linker helper which isn't
quite the same as GNU libtool.  The upstream buildsystem knows this, and
deals with it, but our override squashes that, of course.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 dev-libs/libtomcrypt/libtomcrypt-1.18.2-r4.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r4.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r4.ebuild
index a42911b32ece..cc30adcd38f5 100644
--- a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r4.ebuild
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r4.ebuild
@@ -77,7 +77,11 @@ mymake() {
 	fi
 
 	# Fix cross-compiling, but allow manual overrides for slibtool, which works.
-	[[ -z ${LIBTOOL} ]] && declare -x LIBTOOL="${BASH} ${ESYSROOT}/usr/bin/libtool"
+	if [[ -z ${LIBTOOL} ]] ; then
+		local pfx=
+		[[ ${CHOST} == *-darwin* ]] && pfx=g  # Darwin libtool != glibtool
+		declare -x LIBTOOL="${BASH} ${ESYSROOT}/usr/bin/${pfx}libtool"
+	fi
 
 	# IGNORE_SPEED=1 is needed to respect CFLAGS
 	EXTRALIBS="${extra_libs[*]}" emake \


             reply	other threads:[~2024-01-12 15:11 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-12 15:11 Fabian Groffen [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-12-27 15:43 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libtomcrypt/ James Le Cuirot
2023-07-27  5:11 WANG Xuerui
2022-07-26  4:26 Sam James
2022-06-13 16:29 Sam James
2022-06-13 10:21 Agostino Sarubbo
2022-06-13  9:46 Agostino Sarubbo
2022-06-13  7:15 Agostino Sarubbo
2022-06-13  7:10 Agostino Sarubbo
2022-06-13  7:09 Agostino Sarubbo
2022-06-13  7:07 Agostino Sarubbo
2022-05-11  1:21 Sam James
2022-05-11  1:20 Sam James
2021-10-20 19:01 Mike Gilbert
2021-09-27 12:38 James Le Cuirot
2021-08-28  8:50 Fabian Groffen
2021-07-28  0:19 Marek Szuba
2021-03-19  2:28 Sam James
2021-03-19  2:27 Sam James
2021-02-20  4:02 Joshua Kinard
2021-02-18  7:27 Sam James
2021-02-02 21:01 Sam James
2021-01-30  5:24 Sam James
2021-01-30  5:24 Sam James
2021-01-27  3:06 Sam James
2021-01-25 20:06 Sam James
2021-01-25 20:06 Sam James
2021-01-25 14:10 Sam James
2021-01-25 14:09 Sam James
2021-01-25 14:06 Sam James
2021-01-11  8:00 Sam James
2021-01-06  0:02 Sam James
2020-12-25  1:07 Matt Turner
2020-12-24 18:37 Sergei Trofimovich
2020-12-24 18:35 Sergei Trofimovich
2020-12-23 20:19 Sam James
2020-12-23 20:04 Sam James
2020-12-23  5:23 Sam James
2020-12-23  5:23 Sam James
2020-12-23  5:23 Sam James
2020-12-22  9:47 Michał Górny
2020-12-20 11:36 Michał Górny
2016-08-21 12:44 Pacho Ramos
2016-03-05 18:15 Patrick Lauer
2016-03-05 16:25 Patrick Lauer

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=1705072289.c1863cfc833846a75595a25442d2ad191716a798.grobian@gentoo \
    --to=grobian@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