diff options
| author |   Aron Griffis <agriffis@gentoo.org> | 2003-11-17 18:01:20 +0000 |
|---|---|---|
| committer | Aron Griffis <agriffis@gentoo.org> | 2003-11-17 18:01:20 +0000 |
| commit | 1539157fa191fcbe080d045065544b8fa39e0201 (patch) | |
| tree | 25b9a56ab9206cef151f9027bf269a159cb09b71 /sys-devel | |
| parent | A few more little fixes. (diff) | |
| download | gentoo-2-1539157fa191fcbe080d045065544b8fa39e0201.tar.gz gentoo-2-1539157fa191fcbe080d045065544b8fa39e0201.tar.bz2 gentoo-2-1539157fa191fcbe080d045065544b8fa39e0201.zip | |
repair alpha compilation
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/gettext/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-devel/gettext/Manifest | 8 | ||||
| -rw-r--r-- | sys-devel/gettext/gettext-0.12.1.ebuild | 10 |
3 files changed, 17 insertions, 6 deletions
diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog index fb0bde84d267..947a70998f61 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.27 2003/11/15 08:54:52 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.28 2003/11/17 18:01:17 agriffis Exp $ + + 17 Nov 2003; Aron Griffis <agriffis@gentoo.org> gettext-0.12.1.ebuild: + Repair compilation on alpha when compaq-jdk/jre is installed 13 Nov 2003; Brad House <brad_mssw@gentoo.org> gettext-0.12.1.ebuild: take ~amd64 flag off gettext-0.12.1. It detects diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest index 978315e5f61d..e6af9115f57c 100644 --- a/sys-devel/gettext/Manifest +++ b/sys-devel/gettext/Manifest @@ -1,8 +1,8 @@ -MD5 b5866596eb1778e9ce1c2c4815dea64f gettext-0.12.1.ebuild 1385 -MD5 763fc1af245f4f84e158d0bda5345db1 gettext-0.11.5.ebuild 1466 +MD5 b1adffb9d63305b3cd507f8e92780554 ChangeLog 4473 +MD5 39ec9f21c7d80d6612a392ac6511ce1d gettext-0.12.1.ebuild 1732 MD5 18696e1e264fc2bcae363254f12f346a gettext-0.11.5-r1.ebuild 1830 -MD5 ba70909156146a9e004b6edb1bdf555b ChangeLog 4335 +MD5 763fc1af245f4f84e158d0bda5345db1 gettext-0.11.5.ebuild 1466 MD5 e846923f9b90ce853b73bfd6756a7cab files/gettext-0.12.1-bootstrap.patch 51612 MD5 e99872d90f08d5a5ce57121d10f0e07f files/digest-gettext-0.11.5 67 -MD5 83b80576c27ac3a75d70802eb9c92790 files/digest-gettext-0.12.1 67 MD5 e99872d90f08d5a5ce57121d10f0e07f files/digest-gettext-0.11.5-r1 67 +MD5 83b80576c27ac3a75d70802eb9c92790 files/digest-gettext-0.12.1 67 diff --git a/sys-devel/gettext/gettext-0.12.1.ebuild b/sys-devel/gettext/gettext-0.12.1.ebuild index 2c985108b1d1..15eb3ce4e24d 100644 --- a/sys-devel/gettext/gettext-0.12.1.ebuild +++ b/sys-devel/gettext/gettext-0.12.1.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.12.1.ebuild,v 1.6 2003/11/14 04:37:16 brad_mssw Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.12.1.ebuild,v 1.7 2003/11/17 18:01:17 agriffis Exp $ inherit eutils @@ -27,6 +27,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 + CXX=${CC} econf \ --disable-shared \ --with-included-gettext \ |