fix installation on PaX kernels (thanks to yangjay)

Package-Manager: portage-2.2.10_p40/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 21 insertions, 27 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 5b283617c949..879dac041a91 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.261 2014/07/30 13:20:16 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.262 2014/08/01 09:12:49 slyfox Exp $
+
+  01 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.6.3-r1.ebuild,
+  ghc-7.8.3.ebuild:
+  fix installation on PaX kernels (thanks to yangjay)
 
   30 Jul 2014; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.8.3.ebuild:
   Fix pax-marking command for final ghc binary.
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index f1fa95375c2e..e2a59e3ae63f 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -108,15 +108,15 @@ EBUILD ghc-7.4.1-r1.ebuild 21359 SHA256 58c914920bddc3dc9ef84509fd58ec2d3cb86ca8
 EBUILD ghc-7.4.1.ebuild 20555 SHA256 24af5f5cac7746f627708fc5e74fc72f528409f2912032a5ed8bf0595d3d88a3 SHA512 040180430cacfb19816dbbb7deed54ea08424d5ceae275a61b25bde38f68419fa6a65e1dc7dddc887f967eeb47ae81f430a2dbc4cc750c542254e91101734d47 WHIRLPOOL b344b1465f05555da6b22be4351820c557cc575e61661dab79dea92ae98530fa57c8174a108cf80b5cfccc6572a4b5b14a23393719e307fca16bf91781c2951e
 EBUILD ghc-7.4.2.ebuild 22109 SHA256 c061678ca7fb3e578856ed5e5ccd72b9e1cf86000889d41b64bf51dcfcdaad3c SHA512 9fa1ac3968cb2e9cc231d2fdaf0fee54b1070c925a86f5fc257858a3bab9eb1b684893a405d4f7fbbc0a6771fa06b7d572e790368f8093e23abed176cefaa43a WHIRLPOOL 813f4113c4dd73bfd0591d48f426a6451b1662458e75ea6b3f748a8d64fec354273cc15f8db218e03965338e87e0b00ffc424dd7defc77a5424ef8651fa29038
 EBUILD ghc-7.6.2.ebuild 25352 SHA256 1986bda9cf2dcc52b90b3dd18d8241bb9d93b5f7b7eac5bf5db99dc2bb0503af SHA512 64ebb74a3132a6a162c30fc588592dbfe72328da0d3fa2435942165e470df0ffbcbb640361d1f0a6a9efaf25a5648149c4e8a5e0a16fc39f4bcaa07907e38038 WHIRLPOOL 68d57561fa4dc29ba9c104c85cf9b0df624860ff2b24438659861c76e3472847fd34de8f619eaf0e010e115a712ab7837c3a39153d663c4a429a3c7ba035de10
-EBUILD ghc-7.6.3-r1.ebuild 29113 SHA256 2dbf5ec58e8960667d4ea29880cc467341a036b3bdc3d57380b49934fb70006e SHA512 db516cbebd53d3ffe29cc697fbdf094d02da416f366171b22da97871425de7d6cfb1662e1bec3ea10ebc486aebed7d887b5197ebb351813ebc06dd00a196c041 WHIRLPOOL f0e1ef9d0646052b1fa7c9850c5851c6267b9c6f21997f2fa279505e18b60d33bae6a719d0473a736e93a9f81749658804cf4390f3a69ecfd208454e1f5d882c
+EBUILD ghc-7.6.3-r1.ebuild 28938 SHA256 52bd75d7de66265043bfe17f928719f4dcf419e9f8c31e4e69b167d9faf6dacd SHA512 eb2fcd7097d74cd60d1f9aececb242cfa10cc192e16f766f55563d14dc799273b6a9a3436d48e3c5344b05d53fb9a56ce86c39889e8abccb68a0bdf71f2f5a01 WHIRLPOOL d50b75362fe300d82086d534c8071e8d9837222f2e1bc80ce6c93059783268d2c402b6335de872c2fd7fc1bfcdd146f126f58e615aa33aba63a456af6ca33869
 EBUILD ghc-7.6.3.ebuild 26240 SHA256 517f567d0241deee7c473edcc999c7255f7a8cb14e6cc36f13850021e7802310 SHA512 26c8aa9894e1bcc194b2f62dd1741d03e90ea0b8607e760027117c391ab0ff036e66fe76ce8b07d5cc1acf372e3ed4316d9b866d818e5299285cfbfcb13c19eb WHIRLPOOL 429c9f83b45b153145a999655c6a9f17518f70e48ecbfe91cb8d682eacc3ea9d7818b0de23a7507aa454b3885dbcff3a8393f5f4eb734402f1dd0688535500bc
-EBUILD ghc-7.8.3.ebuild 20694 SHA256 2549c064354990e856b0e104c18ca54ecab3f6b0fb9949250cb019e24933d89f SHA512 c6c88368beb01f848d04a7a961784cf0b04b682a431d5a2ae3132469b42dcf3cc177745375d817b224d765641bda15bf60fdce29048c7e170384d0ad634773bd WHIRLPOOL eea4d5626d07bc0bc6490593c33db6f97b9cbafb74d5527d5c74411c8ae7910085cd95a74518ba33de2c57ef502a92df6c9a4fc4e7d2dbefcbdbd166fa1cfef0
-MISC ChangeLog 47622 SHA256 913984177229bed6be77381f23a2598fed678c6ef2fb1ecf01b48f75f1e51dea SHA512 5703fcb085f293185dc1a6502097df499abd7b9f4206e7e0094d1ff29c564fc293eaad6d3b93332f02c6ddefff4ff321d89bce2b465d5d1edf95bb102bab25ba WHIRLPOOL e7473b79320875e5e1a16d211ed90ef156e65abe76eab1c50dbb935b48798317793845ed490a0e9a19b1f7c07a5ddf35edc6f5dc3a1b86de30502ee9f5bfd30c
+EBUILD ghc-7.8.3.ebuild 20509 SHA256 60468bbbf12753fd1c82b8ded108705a319ccc5b357a70626fe7959b0a0c6d5d SHA512 cd4be6a4359b4ec1c20a603e71c161a1a22f855ecbc14ee1a4124dafb67f412a9f23809aa8cbfc0b4bc2389eee7de77c554de56c89abd83ad9b56d936f1bf0c7 WHIRLPOOL c47e30accaf7a66bd79241110b50bcb4e4c56b9624ddfe68ca4294dcf4439a26df3434e3158f2cb793b032b80624641ea097682bc76c5b633a81e1ee4a83ef35
+MISC ChangeLog 47772 SHA256 b586311713ff8ce74eaad781c848498af8961e6f43b124df1de06838a9c23c70 SHA512 e67713651fae7bbc11d675a66b040817748597b88cf0f3e59716d7f88e1a734b363322ca45976a4ccb3e94069da3a3818b9af400a09d6c34ead78a2b532b4a00 WHIRLPOOL 21ea043bbfbf52a24f3c1d156ca69d484a7328c72374f3356b8836458116ab614242b1150af2fdb4a8374219324c543e919ef63c2a9e7f128db4946f2216b1f8
 MISC metadata.xml 626 SHA256 3bca7daea686cdf5a067c63614567e4764b7130d056205e759f6d8c39bbc70c2 SHA512 687a12b19afe4db07e06e10c51179a69730fc2c236602ecc71011d61644f626d368b8f272e970dbd5bc6ac4dc6bb9c23e2ca06e558c3c0f7bb715dfb3dcdbc35 WHIRLPOOL c15587a1b4d9e5b32556cb281d5a947520629548a9bacc51ff8247bfa09aed2d3420dd6731b0c3a5cc5e8b9a3baba033aa27402b8dcc50bf23dcebe8e3250db3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlPY8QYACgkQcaHudmEf86oZ+ACfUDCy4mfjo9e++k0gbPlQlbvo
-jMEAn2WUnDTdGbIgP9ONmwY6+8Xx4Dco
-=RZDO
+iEYEAREIAAYFAlPbWhQACgkQcaHudmEf86ryXQCdEldvNoeuKb+QxauCGFrGzyhR
+bQwAn2AYz6IpBKb462tmf3lXnY53jwW7
+=lFOY
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc/ghc-7.6.3-r1.ebuild b/dev-lang/ghc/ghc-7.6.3-r1.ebuild
index 56f8302fcd95..16e38a504686 100644
--- a/dev-lang/ghc/ghc-7.6.3-r1.ebuild
+++ b/dev-lang/ghc/ghc-7.6.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.12 2014/07/05 15:40:40 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.13 2014/08/01 09:12:49 slyfox Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -604,10 +604,10 @@ src_compile() {
 		#   but let users screw it by setting 'I_DEMAND_MY_CORES_LOADED'
 		# 4 parallel jobs usually does not break
 
-		# 1. build compiler binary(+wrapper) first
-		emake $(limit_jobs 4) inplace/bin/ghc-stage2 V=1
+		# 1. build compiler binary first
+		emake $(limit_jobs 4) ghc/stage2/build/tmp/ghc-stage2 V=1
 		# 2. pax-mark (bug #516430)
-		pax-mark -m inplace/lib/ghc-stage2
+		pax-mark -m ghc/stage2/build/tmp/ghc-stage2
 		# 3. and then all the rest
 		emake $(limit_jobs 4) all V=1
 
@@ -726,16 +726,11 @@ src_install() {
 			DESTDIR="${D}" \
 			|| die "make ${insttarget} failed"
 
-		# remove wrapper and linker
+		# remove wrapper and link
 		rm -f "${ED}"/usr/bin/haddock*
 
 		add-c_nonshared-to-ghci-libs
 
-		# ghci uses mmap with rwx protection at it implements dynamic
-		# linking on it's own (bug #299709)
-		# so mark resulting binary
-		pax-mark -m "${ED}/usr/$(get_libdir)/${P}/ghc"
-
 		if [[ ! -f "${S}/VERSION" ]]; then
 			echo "${GHC_PV}" > "${S}/VERSION" \
 				|| die "Could not create file ${S}/VERSION"
diff --git a/dev-lang/ghc/ghc-7.8.3.ebuild b/dev-lang/ghc/ghc-7.8.3.ebuild
index adbfdab1b83d..f2a21154c00c 100644
--- a/dev-lang/ghc/ghc-7.8.3.ebuild
+++ b/dev-lang/ghc/ghc-7.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.4 2014/07/30 13:20:16 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.5 2014/08/01 09:12:49 slyfox Exp $
 
 EAPI=5
 
@@ -489,10 +489,10 @@ src_configure() {
 
 src_compile() {
 	if ! use binary; then
-		# 1. build compiler binary(+wrapper) first
-		emake inplace/bin/ghc-stage2
+		# 1. build compiler binary first
+		emake ghc/stage2/build/tmp/ghc-stage2
 		# 2. pax-mark (bug #516430)
-		pax-mark -m inplace/lib/bin/ghc-stage2
+		pax-mark -m ghc/stage2/build/tmp/ghc-stage2
 		# 3. and then all the rest
 		emake all
 	fi # ! use binary
@@ -525,11 +525,6 @@ src_install() {
 		# remove link, but leave 'haddock-${GHC_P}'
 		rm -f "${ED}"/usr/bin/haddock
 
-		# ghci uses mmap with rwx protection at it implements dynamic
-		# linking on it's own (bug #299709)
-		# so mark resulting binary
-		pax-mark -m "${ED}/usr/$(get_libdir)/${GHC_P}/bin/ghc"
-
 		if [[ ! -f "${S}/VERSION" ]]; then
 			echo "${GHC_PV}" > "${S}/VERSION" \
 				|| die "Could not create file ${S}/VERSION"