diff options
| author |   Ralph Sennhauser <sera@gentoo.org> | 2011-11-13 22:39:22 +0000 |
|---|---|---|
| committer | Ralph Sennhauser <sera@gentoo.org> | 2011-11-13 22:39:22 +0000 |
| commit | 84fa76b6437f72585ba6ab9869dfd220344d07cd (patch) | |
| tree | 59b14c73b7dde539a8c4e0caa9f0d24857cf07e8 /dev-java/icedtea | |
| parent | fix sci-mathematics/cgal[gmp] problem (thanks rinus, bug 390309) (diff) | |
| download | gentoo-2-84fa76b6437f72585ba6ab9869dfd220344d07cd.tar.gz gentoo-2-84fa76b6437f72585ba6ab9869dfd220344d07cd.tar.bz2 gentoo-2-84fa76b6437f72585ba6ab9869dfd220344d07cd.zip | |
Fix building with PaX enabled kernels. Bug #389751. Thanks to Daniel Kuehn <enhaisa@gmail.com> and Magnus Granberg <zorry@gentoo.org> for their help finding the patch
(Portage version: 2.1.10.33/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/icedtea')
| -rw-r--r-- | dev-java/icedtea/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/icedtea/icedtea-7.2.0-r1.ebuild | 12 |
2 files changed, 17 insertions, 2 deletions
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index 4196ca682336..9ad5beef2869 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/icedtea # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.46 2011/11/12 14:50:14 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.47 2011/11/13 22:39:22 sera Exp $ + + 13 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-7.2.0-r1.ebuild: + Fix building with PaX enabled kernels. Bug #389751. Thanks to Daniel Kuehn + <enhaisa@gmail.com> and Magnus Granberg <zorry@gentoo.org> for their help + finding the patch 12 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-7.2.0-r1.ebuild: Use java-vm_sandbox-predict for installing the controle file diff --git a/dev-java/icedtea/icedtea-7.2.0-r1.ebuild b/dev-java/icedtea/icedtea-7.2.0-r1.ebuild index 2e6a34611e07..c5a46d693ce9 100644 --- a/dev-java/icedtea/icedtea-7.2.0-r1.ebuild +++ b/dev-java/icedtea/icedtea-7.2.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.10 2011/11/12 14:50:14 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.11 2011/11/13 22:39:22 sera Exp $ # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) # ********************************************************* @@ -169,6 +169,16 @@ src_unpack() { unpack ${ICEDTEA_PKG}.tar.gz } +java_prepare() { + # Fix building with PaX enabled kernels. Bug #389751 + # Move applying test_gamma.patch to before creating boot copy. + if grep '^PaX:' /proc/self/status > /dev/null; then + sed -i -e 's|patches/boot/test_gamma.patch||' Makefile.in || die + sed -i -e 's|openjdk-boot|openjdk|g' patches/boot/test_gamma.patch || die + export DISTRIBUTION_PATCHES=patches/boot/test_gamma.patch + fi +} + unset_vars() { unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS } |