public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Maciej Barć" <xgqt@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/smlnj/
Date: Thu,  2 Dec 2021 21:43:29 +0000 (UTC)	[thread overview]
Message-ID: <1638481405.d79265d95303713f475cf5f2a1fcb93331de9364.xgqt@gentoo> (raw)

commit:     d79265d95303713f475cf5f2a1fcb93331de9364
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  2 21:39:38 2021 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Thu Dec  2 21:43:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d79265d9

dev-lang/smlnj: move unpack script to src_unpack; fix nm

Closes: https://bugs.gentoo.org/729884
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-lang/smlnj/smlnj-110.99.2.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-lang/smlnj/smlnj-110.99.2.ebuild b/dev-lang/smlnj/smlnj-110.99.2.ebuild
index a327249fde59..98c8b3ecdf06 100644
--- a/dev-lang/smlnj/smlnj-110.99.2.ebuild
+++ b/dev-lang/smlnj/smlnj-110.99.2.ebuild
@@ -75,12 +75,12 @@ src_unpack() {
 	unpack ${P}-config.tgz
 	rm config/*.bat || die
 	echo SRCARCHIVEURL=\"file:/${S}\" > "${S}"/config/srcarchiveurl
-}
 
-src_prepare() {
 	mkdir base || die  # without this unpacking runtime will fail
 	./config/unpack "${S}" runtime || die
+}
 
+src_prepare() {
 	default
 
 	# respect CC et al. (bug 243886)
@@ -89,6 +89,8 @@ src_prepare() {
 		-e "/^CPP/s:gcc:$(tc-getCC):" \
 		-e "/^CFLAGS/{s:-O[0123s]:: ; s:=:= ${CFLAGS}:}" \
 		-i base/runtime/objs/mk.* || die
+
+	sed -i "s|nm |$(tc-getNM) |g" config/chk-global-names.sh || die
 }
 
 src_compile() {


             reply	other threads:[~2021-12-02 21:43 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-02 21:43 Maciej Barć [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-14 23:40 [gentoo-commits] repo/gentoo:master commit in: dev-lang/smlnj/ Maciej Barć
2024-11-14 23:40 Maciej Barć
2024-05-26 21:36 Maciej Barć
2024-05-26 21:36 Maciej Barć
2023-08-05 16:53 Maciej Barć
2022-07-29 10:19 Maciej Barć
2022-06-27 23:41 Maciej Barć
2022-03-19 11:57 Maciej Barć
2022-03-18  9:31 Maciej Barć
2022-03-18  8:38 Maciej Barć
2022-01-04 17:54 Maciej Barć
2021-12-02  0:02 Maciej Barć
2021-12-01 21:11 Maciej Barć
2021-12-01 21:11 Maciej Barć
2019-12-15 13:37 Michał Górny

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=1638481405.d79265d95303713f475cf5f2a1fcb93331de9364.xgqt@gentoo \
    --to=xgqt@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