[gentoo-commits] repo/gentoo:master commit in: dev-lang/smlnj/

[Maciej Barć]

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() {