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 | b45293d0087190df9e829e20cc06f106afd8efdd (patch) | |
| tree | da7bfd30f5b40c461e2c0aa39a4ad47a92ec9bd3 /dev-lang/smlnj | |
| parent | Automated update of use.local.desc (diff) | |
| download | historical-b45293d0087190df9e829e20cc06f106afd8efdd.tar.gz historical-b45293d0087190df9e829e20cc06f106afd8efdd.tar.bz2 historical-b45293d0087190df9e829e20cc06f106afd8efdd.zip | |
Respect environment flags and targets wrt #243886 by Michael Weber.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'dev-lang/smlnj')
| -rw-r--r-- | dev-lang/smlnj/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-lang/smlnj/Manifest | 4 | ||||
| -rw-r--r-- | dev-lang/smlnj/smlnj-110.71.ebuild | 20 |
3 files changed, 24 insertions, 7 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/Manifest b/dev-lang/smlnj/Manifest index 72938b91523c..7c1d43df1239 100644 --- a/dev-lang/smlnj/Manifest +++ b/dev-lang/smlnj/Manifest @@ -96,6 +96,6 @@ EBUILD smlnj-110.45.ebuild 2336 RMD160 4771976de855371e9cb20f3ee3423866956e31de EBUILD smlnj-110.67-r1.ebuild 2860 RMD160 21b8bcabec8d1a67c24e7eb29971c64851491191 SHA1 0560cd428df32654f44409d56ef80a238d8b1117 SHA256 bb126722a423f24d2ee5b80eb2d7f7b9a7159f06ce099d7d543f10b57610e535 EBUILD smlnj-110.67-r2.ebuild 2914 RMD160 21121ba8c5063eff7cace5d86e65d9517f4c40c5 SHA1 418c106b659890eb61fe3cc216d28ca28c4f621c SHA256 589a524ee4063e2315f4d41570eaeb50215eb56d5a8e1815cd88c907da20c486 EBUILD smlnj-110.69.ebuild 1869 RMD160 f972672efa813dab024fe9f6c45c8c3e5886d4b8 SHA1 722b3242b65710da8d1f17944e809a1809baee43 SHA256 2aa890e7b73fa11f23329c15352545383436917ef885b86003d4b678d4c00655 -EBUILD smlnj-110.71.ebuild 1869 RMD160 0fba43d2a2fa820c50d7d8312c2abbd0d839dc38 SHA1 feed20eeeadc342301fb63aff77a1c2883eff9d4 SHA256 a8dd6d99b7f3b9c8c0ecf7d4c5a441ccdbe213885b002b6d5eda98dbed82c83f -MISC ChangeLog 3613 RMD160 f74061833d60934a9faeb18182afab023dd8b97e SHA1 74334c293b55c805691f22ea5c083ff331a44d6c SHA256 fca85d076e4ca48a0cb8e09bee42497cc9d3aa62dc60dbf890e0cbc284570ba7 +EBUILD smlnj-110.71.ebuild 2217 RMD160 6fc487cf9476372d88417b52de2deddcf718bb56 SHA1 234a14d0acb6cc9cda8f8a3d0b664c8b2be8b3df SHA256 baec0293d49c4ba8e38f9381b8c2dd3ab836f9ef8cc7490129b38c8cc844ebe6 +MISC ChangeLog 3763 RMD160 00378dad78bec8d37c3297de271822f411e5aa2f SHA1 c38378df3379b6e0b6a5018bf2e1f4717cb8e1e5 SHA256 525c1188346c28b6ee0461be23deb893f7e77fc888af3f762fc97b03b69bfab0 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 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() { |