diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-06-29 12:13:03 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-06-29 12:13:03 +0000 |
| commit | d333f44124dcb238893e15e0f4658b142197b2ad (patch) | |
| tree | db10dc6d481cbfdf5d13b3e02be8b20744525ced /dev-lang | |
| parent | Automated update of use.local.desc (diff) | |
| download | gentoo-2-d333f44124dcb238893e15e0f4658b142197b2ad.tar.gz gentoo-2-d333f44124dcb238893e15e0f4658b142197b2ad.tar.bz2 gentoo-2-d333f44124dcb238893e15e0f4658b142197b2ad.zip | |
Respect environment flags and targets wrt #243886 by Michael Weber.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/smlnj/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-lang/smlnj/smlnj-110.71.ebuild | 20 |
2 files changed, 22 insertions, 5 deletions
diff --git a/dev-lang/smlnj/ChangeLog b/dev-lang/smlnj/ChangeLog index db0d08bd937b..88ad7cc35e60 100644 --- a/dev-lang/smlnj/ChangeLog +++ b/dev-lang/smlnj/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/smlnj -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/ChangeLog,v 1.22 2009/10/09 14:33:22 hkbst Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/ChangeLog,v 1.23 2010/06/29 12:13:03 ssuominen Exp $ + + 29 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> smlnj-110.71.ebuild: + Respect environment flags and targets wrt #243886 by Michael Weber. *smlnj-110.71 (09 Oct 2009) diff --git a/dev-lang/smlnj/smlnj-110.71.ebuild b/dev-lang/smlnj/smlnj-110.71.ebuild index c32908fa0a65..0d35e9b5288f 100644 --- a/dev-lang/smlnj/smlnj-110.71.ebuild +++ b/dev-lang/smlnj/smlnj-110.71.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/smlnj-110.71.ebuild,v 1.1 2009/10/09 14:33:22 hkbst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/smlnj-110.71.ebuild,v 1.2 2010/06/29 12:13:03 ssuominen Exp $ EAPI=2 @@ -59,7 +59,7 @@ SLOT="0" KEYWORDS="-* ~amd64 ~ppc ~x86" IUSE="" -S="${WORKDIR}" +S=${WORKDIR} src_unpack() { mkdir -p "${S}" @@ -68,6 +68,20 @@ src_unpack() { done unpack ${P}-config.tgz && rm config/*.bat echo SRCARCHIVEURL=\"file:/${S}\" > "${S}"/config/srcarchiveurl + + # Required for sed in src_prepare + mkdir base || die + ./config/unpack "${S}" runtime || die +} + +src_prepare() { + # Use environment wrt #243886 + sed -i \ + -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}:}" \ + base/runtime/objs/mk.x86-linux || die } src_compile() { |