diff options
| author |   Marijn Schouten <hkbst@gentoo.org> | 2012-10-19 11:04:26 +0000 |
|---|---|---|
| committer | Marijn Schouten <hkbst@gentoo.org> | 2012-10-19 11:04:26 +0000 |
| commit | aee3a0bf291a1dc00a7704f265d2cd955f4c546a (patch) | |
| tree | 548c65f560c1e0c1f6265184f31e1c8ef66a2f30 /dev-lang | |
| parent | sci-biology/mammoth: Remove virtual/fortran and always call fortran-2_pkg_set... (diff) | |
| download | gentoo-2-aee3a0bf291a1dc00a7704f265d2cd955f4c546a.tar.gz gentoo-2-aee3a0bf291a1dc00a7704f265d2cd955f4c546a.tar.bz2 gentoo-2-aee3a0bf291a1dc00a7704f265d2cd955f4c546a.zip | |
fix bug 243886, thanks to Michael Weber (xmw@gentoo.org) for providing a patch
(Portage version: 2.1.11.30/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/smlnj/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/smlnj/smlnj-110.75.ebuild | 18 |
2 files changed, 20 insertions, 4 deletions
diff --git a/dev-lang/smlnj/ChangeLog b/dev-lang/smlnj/ChangeLog index a26b5e5aa6bc..676ec8c2b787 100644 --- a/dev-lang/smlnj/ChangeLog +++ b/dev-lang/smlnj/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/smlnj # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/ChangeLog,v 1.25 2012/10/19 10:36:04 hkbst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/ChangeLog,v 1.26 2012/10/19 11:04:26 hkbst Exp $ + + 19 Oct 2012; Marijn Schouten <hkBst@gentoo.org> smlnj-110.75.ebuild: + fix bug 243886, thanks to Michael Weber (xmw@gentoo.org) for providing a + patch 19 Oct 2012; Marijn Schouten <hkBst@gentoo.org> smlnj-110.75.ebuild: fix bug 248162, thanks to Michael Weber (xmw@gentoo.org) for providing a diff --git a/dev-lang/smlnj/smlnj-110.75.ebuild b/dev-lang/smlnj/smlnj-110.75.ebuild index 1bdc79cb2e7b..afbfa8153d0d 100644 --- a/dev-lang/smlnj/smlnj-110.75.ebuild +++ b/dev-lang/smlnj/smlnj-110.75.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/smlnj-110.75.ebuild,v 1.2 2012/10/19 10:36:04 hkbst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/smlnj-110.75.ebuild,v 1.3 2012/10/19 11:04:26 hkbst Exp $ EAPI="4" -inherit eutils +inherit eutils toolchain-funcs DESCRIPTION="Standard ML of New Jersey compiler and libraries" HOMEPAGE="http://www.smlnj.org" @@ -73,7 +73,19 @@ src_unpack() { DIR=/usr/libexec src_prepare() { - sed -e "/@BINDIR@/s:\$BINDIR:${DIR}/bin:" \ + # respect CC et al. (bug 243886) + mkdir base || die # without this unpacking runtime will fail + ./config/unpack "${S}" runtime || die + for file in mk.*; do + sed -e "/^AS/s:as:$(tc-getAS):" \ + -e "/^CC/s:gcc:$(tc-getCC):" \ + -e "/^CPP/s:gcc:$(tc-getCC):" \ + -e "/^CFLAGS/{s:-O[0123s]:: ; s:=:= ${CFLAGS}:}" \ + -i base/runtime/objs/${file} + done + + # stash bin and lib somewhere (bug 248162) + sed -e "/@BINDIR@/s:\$BINDIR:${DIR}:" \ -e "/@LIBDIR@/s:\$LIBDIR:${DIR}/lib:" \ -i config/install.sh || die } |