Fix building with PaX enabled kernels. Bug #389751. Thanks to Daniel Kuehn <enhaisa...

Package-Manager: portage-2.1.10.33/cvs/Linux x86_64

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 4196ca682336da1b4e8b61141b9aa5787f32fabf..9ad5beef28695f9429624c1a273f5c28dade5c56 100644 (file)
--- 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/Manifest b/dev-java/icedtea/Manifest
index 7638760fd8e667197929aab9b24a58824ef6c69b..a94f5b0cba6564dd2b39ad239dcfcc8d673e3a86 100644 (file)
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -18,6 +18,6 @@ DIST jdk6-jaf-b20.zip 71243 RMD160 40b49d12c39b7010ee917eb671f3c38cd16f271c SHA1
 DIST jdk6-jaxws-b20.zip 5513069 RMD160 47b2d4fe528d770391e8926299df45cc6f68e9b5 SHA1 08366a70c9e2baa516afc77bb69f9e108e906aa9 SHA256 0c460583898b968a58bf88eb53f90a0e34369e2562d65fb3a143512dfcaeb3eb
 DIST openjdk-6-src-b22-28_feb_2011.tar.gz 45279689 RMD160 2b8f92cdb4d7dd3eb3cbb800a73e1666ee4bf5b1 SHA1 65a60153adbc8bc47fb95bb2b588a9a0b8701c95 SHA256 14a097d45b8c040e984be164a8cefbf22040a9ad57474fe87dd8cf2d0b08328b
 EBUILD icedtea-6.1.10.4-r1.ebuild 11119 RMD160 10bdec87cab8a8bc8ca1db3c41c41b22388bb81e SHA1 5fbd929337fb3b2f0107989022714ebcdb5cf760 SHA256 b32935f23be058836d42ced5d7dad3d42189fe3959394b8c43b94395c431c257
-EBUILD icedtea-7.2.0-r1.ebuild 11204 RMD160 df253bd2252ba79d2639f8bfebfb3ebb062c738b SHA1 a42c92f6c60c9d429c8cc524da8bbbfb678a6501 SHA256 5a06d8626f604e8a750a9aaf5834e5c2afdc79dbd0fb0c55b8dab3b726a7a5db
-MISC ChangeLog 8778 RMD160 9319c7ebcb81092b9fae6d5bb2617666ed42b924 SHA1 7871a568e4c52c8bce1979b336ed5016f80b0c3b SHA256 3ddfd17b0d151e58e81730cebf736723fac52973c25e7617fa9610046ce8ed17
+EBUILD icedtea-7.2.0-r1.ebuild 11602 RMD160 49cd5288f8dcc8cac356cf76bcebd89f84eab01c SHA1 bfe7c813b933a147931ec2bc2e94e1907cad54d8 SHA256 a58d1ec40be3fb74bda539ef5f6f02f017e7e2c843024ee10ec853b849a90191
+MISC ChangeLog 9027 RMD160 3cb953a4bc1bb48dbdec62850de6117310d3b6d2 SHA1 725c8ef93249912ceea715011e58897f8619954b SHA256 a53491918793a0d64e1eb3c095551c9d9fb91da9801707be6aae4368ffaa22d9
 MISC metadata.xml 1567 RMD160 7cb547ff92d8896cdbb0dd53aa682fe31d027b4e SHA1 c42d533a391f98fa303b591a4ba1471e0de94b7c SHA256 596df17fd33825a2abb567685bda63f6ff56cbfa616911199855e3fac8bec5e4

diff --git a/dev-java/icedtea/icedtea-7.2.0-r1.ebuild b/dev-java/icedtea/icedtea-7.2.0-r1.ebuild
index 2e6a34611e07d1407036d79bff9a39c995be1b2e..c5a46d693ce99848c039ba345f6ea868db60811f 100644 (file)
--- 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
 }