diff options
| author |   Aron Griffis <agriffis@gentoo.org> | 2003-11-02 16:05:41 +0000 |
|---|---|---|
| committer | Aron Griffis <agriffis@gentoo.org> | 2003-11-02 16:05:41 +0000 |
| commit | 30dfe4e05e02c7f7fd09ef0a950ccd9449889adc (patch) | |
| tree | 5c56f9aa12c2e05a11f152af3949ee4bbbd587c9 /sys-devel | |
| parent | Version bupmed. Closes #32294 (diff) | |
| download | gentoo-2-30dfe4e05e02c7f7fd09ef0a950ccd9449889adc.tar.gz gentoo-2-30dfe4e05e02c7f7fd09ef0a950ccd9449889adc.tar.bz2 gentoo-2-30dfe4e05e02c7f7fd09ef0a950ccd9449889adc.zip | |
repair compilation on alpha
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/gettext/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-devel/gettext/Manifest | 14 | ||||
| -rw-r--r-- | sys-devel/gettext/gettext-0.11.5-r1.ebuild | 10 |
3 files changed, 20 insertions, 9 deletions
diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog index db297d386010..760b21fa0b3d 100644 --- a/sys-devel/gettext/ChangeLog +++ b/sys-devel/gettext/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-devel/gettext # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.22 2003/09/17 18:52:43 avenj Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.23 2003/11/02 16:05:27 agriffis Exp $ + + 02 Nov 2003; Aron Griffis <agriffis@gentoo.org> gettext-0.11.5-r1.ebuild: + Repair compilation on alpha when compaq-jdk/jre is installed 16 Sep 2003; Daniel Robbins <drobbins@gentoo> gettext-0.12.1.ebuild: KEYWORDS="-*" since it needs C++ to compile and breaks bootstrap. diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest index 976e4d9142d0..d56a9b0596a3 100644 --- a/sys-devel/gettext/Manifest +++ b/sys-devel/gettext/Manifest @@ -1,12 +1,12 @@ -MD5 f2cd35ff5b8d9a4868c3a0c2673e3515 gettext-0.11.3-r1.ebuild 1436 +MD5 3726233c30fae22be3bea0a2c205094c ChangeLog 3652 MD5 1b0e6c20c207792ca33761f0fabebad6 gettext-0.11.1.ebuild 1414 -MD5 733f5a8b99e73542dd712c53996c2b4e gettext-0.12.1.ebuild 1258 +MD5 f2cd35ff5b8d9a4868c3a0c2673e3515 gettext-0.11.3-r1.ebuild 1436 +MD5 d13b7c02871605d5ee7e652b86929f03 gettext-0.11.5-r1.ebuild 1833 MD5 763fc1af245f4f84e158d0bda5345db1 gettext-0.11.5.ebuild 1466 -MD5 d2a44bb73ea330e6f4caf261187bb2c6 gettext-0.11.5-r1.ebuild 1482 -MD5 6ff7897521c4d49633c23c892422de0e ChangeLog 3509 -MD5 e1790fcdc21680848c6c1edd65fef16f files/gettext-0.10.38-gentoo.diff 640 +MD5 733f5a8b99e73542dd712c53996c2b4e gettext-0.12.1.ebuild 1258 MD5 aece59e56ab02e28c4fa41834e699ac5 files/digest-gettext-0.11.1 67 -MD5 e99872d90f08d5a5ce57121d10f0e07f files/digest-gettext-0.11.5 67 -MD5 83b80576c27ac3a75d70802eb9c92790 files/digest-gettext-0.12.1 67 MD5 3edc9a1e003157012622c2dd3792229b files/digest-gettext-0.11.3-r1 67 +MD5 e99872d90f08d5a5ce57121d10f0e07f files/digest-gettext-0.11.5 67 MD5 e99872d90f08d5a5ce57121d10f0e07f files/digest-gettext-0.11.5-r1 67 +MD5 e1790fcdc21680848c6c1edd65fef16f files/gettext-0.10.38-gentoo.diff 640 +MD5 83b80576c27ac3a75d70802eb9c92790 files/digest-gettext-0.12.1 67 diff --git a/sys-devel/gettext/gettext-0.11.5-r1.ebuild b/sys-devel/gettext/gettext-0.11.5-r1.ebuild index 1d4948607a07..a67b3020d85f 100644 --- a/sys-devel/gettext/gettext-0.11.5-r1.ebuild +++ b/sys-devel/gettext/gettext-0.11.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.11.5-r1.ebuild,v 1.14 2003/09/17 18:52:43 avenj Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.11.5-r1.ebuild,v 1.15 2003/11/02 16:05:27 agriffis Exp $ S=${WORKDIR}/${P} DESCRIPTION="GNU locale utilities" @@ -26,6 +26,14 @@ src_compile() { local myconf="" use nls || myconf="--disable-nls" + # Compaq Java segfaults trying to build gettext stuff, and there's + # no good way to tell gettext to refrain from building the java + # stuff, so... remove compaq-jdk/jre from the PATH + if use alpha && [[ $JAVAC == *compaq* ]]; then + PATH=$(echo ":${PATH}" | sed 's|:/opt/compaq-j[^:]*||g; s/^://') + unset JAVA_HOME CLASSPATH JDK_HOME JAVAC + fi + econf \ --with-included-gettext \ --disable-shared \ |