Disable stripping of compiled ghc (and related) binary. Fixes bug #299492.

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

4 files changed, 29 insertions, 4 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index ca98988dfd57..fd0204ce8fc8 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.185 2010/07/15 19:13:33 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.186 2010/07/16 20:23:27 slyfox Exp $
+
+  16 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> ghc-6.10.4-r1.ebuild,
+  +files/ghc-6.10.4-disable-strip.patch:
+  Disable stripping of compiled ghc (and related) binary. Fixes bug #299492.
+  Thanks to Davide Pesavento <davidepesa@gmail.com> for the report.
 
   15 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> ghc-6.12.3.ebuild,
   +files/ghc-6.12.3-configure-CHOST-freebsd.patch:
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 1eeeb783f623..29ae81600f62 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -2,6 +2,7 @@ AUX 10ghc 40 RMD160 1c9e367fa4ea2fa2d3a046986b066b157964390a SHA1 33486a4907e814
 AUX depsort.py 1958 RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 SHA1 2c900abeb6cfcc4327f0e9418b5abd7761ce5879 SHA256 7406f639d17b8acab6a1db7e398e74379b44950d4821bc36901abd3455d63b3d
 AUX ghc-6.10.2-readline.patch 8612 RMD160 cf3c1539a55225439c7f16c698e622c5f6f0cd47 SHA1 82318ea6285fc9dd3ed31a023e0a349a4950473c SHA256 9be6fe23aed177c6dd16fcea4eb9ba39406ee365cb923b33d084dec451005464
 AUX ghc-6.10.4-autoconf.patch 2010 RMD160 c5154aca1828ff5bf5289da6167c2218ad6cb1ab SHA1 a100d0ba94516eacc7dcb5d99fd3b69a72f6e658 SHA256 125afd89af86b32bcf88dd97860993dc6f7ef9920a3f3dfb577897837fbcf4fe
+AUX ghc-6.10.4-disable-strip.patch 782 RMD160 b892e4133ff36e056e3f0e015388b1a5ffd61da4 SHA1 d83ca80f339f5de1772e2e70dbf2d6353257ba84 SHA256 3d61160acc28afed2c2fd0a37c460b57368d81d5a18c8fcd07867cfdc8a190a6
 AUX ghc-6.10.4-ia64-fixed-relax.patch 1368 RMD160 83b75c2cb44c4b35d12206570c59830706314537 SHA1 9f6c81a9ca9657be580ffb232d4dc73ae1bfbe11 SHA256 f2862403cc89c3f7e83fcc569cf357597d70afd444194178eb2a299f16a938c3
 AUX ghc-6.10.4-ia64-storage-manager-fix.patch 2978 RMD160 27ed550d5cb75a6c1b1313d54934466e042d6c20 SHA1 937624c7bfff123cc6ad00bbfc4f46376b61080a SHA256 8b650cdfe0ba5657dd0bced3c07f9d3dca7a1e9304ac1d70099cacc0829650e2
 AUX ghc-6.10.4-libm-detection.patch 1791 RMD160 37cf97b3477fbe3af11d558f0a5b83979c08e7a3 SHA1 2049ad0966df39ad298d7bc96d7a06e5bd52de71 SHA256 05eaaadb68ae16b7569a722008bc9a697c9dae84673b285400c6744cb600a3a9
@@ -85,7 +86,7 @@ DIST ghc-bin-6.8.2-x86.tbz2 30872949 RMD160 ce2f9f6fe88440ba3574d85c219e96210d35
 DIST ghc-bundled-readline-5.2_p13-amd64.tbz2 976677 RMD160 f0543aa3f404d45aad4360cc07b777c3aaafc5fb SHA1 1737eae6fe00c4924577e6eb8fa5d2c7eb0b24ca SHA256 f67250899590a551278695bcb7f143c5a6423ea47e5e6966615072cc0f9b51f0
 DIST ghc-bundled-readline-5.2_p13-x86.tbz2 940742 RMD160 5f9470a99047f004bd0917c62253bff9b663c9a5 SHA1 f5463a8929d2ba792b91085f78d6763cb50ef14e SHA256 bb9766235ed0d6e3c2f3ffe1625ecbe8e4d2e0254f7060e845be3a404835cd2a
 DIST ghc-testsuite-6.4.2.tar.gz 1181389 RMD160 1eea6a19a9fca6b3d56a6f29b69289cb88af8173 SHA1 7ada60fe2abb9208d841787781d522d5a1110dc2 SHA256 1a864243e922c233049585fa3bf4a86a0ca3e7b3ffebf26245eb037f15dd4d12
-EBUILD ghc-6.10.4-r1.ebuild 12197 RMD160 8dd49bf3e2d898bed796a3b6f02aae7cc3fa8393 SHA1 01dd85aff599f429352e7c09b190f2f4e94df5be SHA256 70ab6f3bea1ae8514db893405f05bce05e1be537b28c26078b6341d5ed723e36
+EBUILD ghc-6.10.4-r1.ebuild 12359 RMD160 dd0acfddbe5c64e45f32145abd29317e380796ee SHA1 13d978d782b10dc5142ef07eee3355abd9281394 SHA256 c23e2138f65b7be7db8c8d6998d38d8989bad3514a14a6e487f5070c0268aa34
 EBUILD ghc-6.12.1.ebuild 11652 RMD160 be2f744677826a3829f3209a0c4f7aaddc397868 SHA1 4dba47dbd13960d7eb65bc8873f2102c0a62f580 SHA256 1897ff08258c8b47bce02733c020477bcb17e08134c7d3a8d3197943f509c083
 EBUILD ghc-6.12.3.ebuild 13393 RMD160 e45a422b0211c8aa9d4d9aafc3fefaa71ef31449 SHA1 a9d8fde4f888e9eb593f23b72d04f23000877836 SHA256 3da92ff7d119ac8b88d884ac98ee2eeed3db05b19f55c9619fd0e98b3b810e21
 EBUILD ghc-6.2.2.ebuild 10453 RMD160 8822230d0fbc924eda4df3e417a99fd7e36a032e SHA1 01f6e719cc43b984fbaa2cd347a4689a31c1e127 SHA256 46bbb5f3782f2fed906229b73a525dbffbeec29bfacc68acb14b2937cd662399
@@ -94,5 +95,5 @@ EBUILD ghc-6.6.1.ebuild 12183 RMD160 3261a2bbff0a47859c5519f4607ebf6cbdd803ab SH
 EBUILD ghc-6.6.ebuild 10828 RMD160 e39d7ac4869ff11d1f6255f0e3187bdcb8434c46 SHA1 50da32278fc86b1403476bd2a412f2bad95e4332 SHA256 e03181b3fd200bc36b7d1bb5bce1e5e054015e43cceff4a7b8f77d65d5a1921a
 EBUILD ghc-6.8.2-r1.ebuild 8999 RMD160 269a048aee9a25a2ec2322c9460b1686f9059da2 SHA1 3501daab94d39db15a8456b3457058a2662cd473 SHA256 f54b71256cb0778f6b51f2ca0b41fc35d5ae915d50a40ae1d1c4f60442b41c17
 EBUILD ghc-6.8.2.ebuild 9051 RMD160 b107b4ce2fc213b34a75757cfd6271b59af97991 SHA1 1897f1ff55d542abb4429213b23af4510433b3a4 SHA256 4822eb3556100cd5aaa8ba2fbc962467e05d2ed7300e405f2c3aef47052e12de
-MISC ChangeLog 33274 RMD160 cc3948743dcdfa0db624703338b0561bd30c968c SHA1 049c600db9b82c48fa7375ef0e98b450c91c6c28 SHA256 2bcc4c8ece6cae48ec5cd0652a9e1e243634d997fe9db9b1b411d09ca8b4bbfb
+MISC ChangeLog 33537 RMD160 82ffaf3aa808238680f45e22e6e405aa953515dc SHA1 a4b4e71923e5c87cd58219feb6e6bb52fc8796d9 SHA256 4f92c173cb90461de4a819f0c2d2cb41c752a3c82805ff7ece7c214473e196b0
 MISC metadata.xml 442 RMD160 9cfa0af9084477c8a70ecf0ac3fb3093ae0cd602 SHA1 be2833090f093ac1c8fc2f5c6f3f253bdbdd6b96 SHA256 2bacbdfcaea11289949a687626f59f99af8fda9ec495b2c349ce5898d9f0dcd4
diff --git a/dev-lang/ghc/files/ghc-6.10.4-disable-strip.patch b/dev-lang/ghc/files/ghc-6.10.4-disable-strip.patch
new file mode 100644
index 000000000000..1b67a3cb0f00
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-6.10.4-disable-strip.patch
@@ -0,0 +1,15 @@
+Unconditionally disable stripping of binaries.
+Address https://bugs.gentoo.org/show_bug.cgi?id=299492
+diff --git a/utils/installPackage/installPackage.hs b/utils/installPackage/installPackage.hs
+index 9ec7282..0174652 100644
+--- a/utils/installPackage/installPackage.hs
++++ b/utils/installPackage/installPackage.hs
+@@ -38,7 +38,7 @@ parseArgs :: [String]
+               FilePath,  -- dist prefix
+               Bool,      -- enable shell wrappers?
+               Bool)      -- strip exe?
+-parseArgs = f normal defaultDistPref False True
++parseArgs = f normal defaultDistPref False False
+     where f _ dp esw strip (('-':'v':val):args)
+               = f (readEOrFail flagToVerbosity val) dp esw strip args
+           f v _  esw strip ("--distpref":dp:args) = f v dp esw strip args
diff --git a/dev-lang/ghc/ghc-6.10.4-r1.ebuild b/dev-lang/ghc/ghc-6.10.4-r1.ebuild
index ff52e3105626..5ddeddaa9fb8 100644
--- a/dev-lang/ghc/ghc-6.10.4-r1.ebuild
+++ b/dev-lang/ghc/ghc-6.10.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild,v 1.8 2010/07/14 09:02:35 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild,v 1.9 2010/07/16 20:23:27 slyfox Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -186,6 +186,10 @@ src_unpack() {
 
 		cd "${S}"
 
+		# disable cabal built binary stripping (solves bug #299492)
+		# as installPackage strips them by default
+		epatch "${FILESDIR}/ghc-6.10.4-disable-strip.patch"
+
 		# patch aclocal.m4 and configure.ac to work with >=autoconf-2.64
 		epatch "${FILESDIR}/${P}-autoconf.patch"