Fixed configure regeneration failure (bug #337025)

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

4 files changed, 33 insertions, 4 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 654197297171..c35d34e66c5c 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.189 2010/09/09 18:53:01 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.190 2010/09/13 18:20:56 slyfox Exp $
+
+  13 Sep 2010; Sergei Trofimovich <slyfox@gentoo.org> ghc-6.12.3.ebuild,
+  +files/ghc-6.12.3-autoconf-2.66-4252.patch:
+  Fixed configure regeneration failure (bug #337025). Thanks to Andrew
+  Savchenko for the report and found solution.
 
   09 Sep 2010; Sergei Trofimovich <slyfox@gentoo.org> ghc-6.12.3.ebuild:
   Added sparc build for 6.12.3. Marked ~sparc (bug #283531)
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index a0a094b866a2..6e4f4f703602 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -11,6 +11,7 @@ AUX ghc-6.10.4-propagate-hc-options-to-all-libraries.patch 2976 RMD160 f8947d895
 AUX ghc-6.12.1-configure-CHOST.patch 851 RMD160 b85347a79d52270e1077c5a6e6ad675dd9a9b24d SHA1 e271c878ad3a7a00078c01858923ab6b814b2474 SHA256 b4e1ebeea2fdd1e04f14140fe07d991ac583f221bc79f0eb175fb378ed12cd69
 AUX ghc-6.12.2-configure-CHOST-part2.patch 958 RMD160 cab606658d051c3b5f5751df2c383d00ba6b5ee7 SHA1 58a26fc518e4e4b587c1742c709bc59d24b871cc SHA256 696cf5693b714b2c19cd3f32d5e96677cf9ad828a3f151f0c16fbc16585227a4
 AUX ghc-6.12.3-alpha-use-libffi-for-foreign-import-wrapper.patch 2575 RMD160 53dd2e84868f8b66e4d8741b121177bf8e305924 SHA1 2b25421962df33044d8f0556756563ab7d5b1a9d SHA256 9b9748775ddcafa0171f1594c4f5e0c90269e4fd65837d9167b127238cec3d93
+AUX ghc-6.12.3-autoconf-2.66-4252.patch 950 RMD160 63225a84d59c6f71593f67d989a647345f7671b0 SHA1 6890dfc4af8d0e98b269219be9e1a5a484358120 SHA256 259813eeefebfc9656341dd6939ab6e7a3257336001d794042f1e6a57b3b20c4
 AUX ghc-6.12.3-configure-CHOST-freebsd.patch 2375 RMD160 6c847baeeeaa6ea75c4cf1c687145ffaaf6153d8 SHA1 cc5128a4f6049b2b61ee5789b6c4d15725bc53e3 SHA256 fd4edb1ff5c1f0f08ffad4bae3b2007af948ecdc9c5c285cc6f2953bca25d3cf
 AUX ghc-6.12.3-ia64-fixed-relax.patch 1362 RMD160 81224e6cc74d20b80b93c55eaeda7e2a6a7e3ae0 SHA1 d93beaf3fa9fa37b87f6fc6c7fc85d488ff809c3 SHA256 db632a48cef7fdce8fd24759af33527d489121ce3e67cbbcd235608aa0247a31
 AUX ghc-6.12.3-ia64-storage-manager-fix.patch 3035 RMD160 067caf41e1ba60b5215b16eafeaec262904e2e2a SHA1 12a9ef095286f22e9b7107af28bff6916c3700d2 SHA256 9e08ad179c7fdc7de1899f89560ec26215968187956f2853639bbe85650fa2ab
@@ -91,12 +92,12 @@ DIST ghc-bundled-readline-5.2_p13-x86.tbz2 940742 RMD160 5f9470a99047f004bd0917c
 DIST ghc-testsuite-6.4.2.tar.gz 1181389 RMD160 1eea6a19a9fca6b3d56a6f29b69289cb88af8173 SHA1 7ada60fe2abb9208d841787781d522d5a1110dc2 SHA256 1a864243e922c233049585fa3bf4a86a0ca3e7b3ffebf26245eb037f15dd4d12
 EBUILD ghc-6.10.4-r1.ebuild 12510 RMD160 fdf6101e0bdccf7932c5db1834034245cfc3a999 SHA1 d3b2010a33b477b95011b70c0fd5e5dda6520056 SHA256 1756810705acfd1afe728be975f4f3fc31763c6a87e5ab895a4cbbd161f03eae
 EBUILD ghc-6.12.1.ebuild 11802 RMD160 f50fd172a32521a4295eb33cc501e6a85a7dc959 SHA1 99fde8eb9bf8370d368df90284b8317fd47188b9 SHA256 100d0e349b29a0d6ea4a2824855aaa1ee19a24b641a514b79055841290b0ee7a
-EBUILD ghc-6.12.3.ebuild 13752 RMD160 9743d05142f888d8382adf3a7f483007714a6d2f SHA1 b27bc3a219c3c2bcdfefe7163de59c02af301f1c SHA256 c317d4395830f68cf1a1a7a9a344e4f84b1b6b0d2de449a07b2658c8de3d39f1
+EBUILD ghc-6.12.3.ebuild 13843 RMD160 3ef685a8e49d5851024b8e0c61b697e08b61c7af SHA1 9ae9a65e2a9c8a03e30ffebc0f5ce50af4ca616a SHA256 4c7331009f2e9e7a35bf1004d1b375151330e72d51ea04abcc3b144f2a9f8bbc
 EBUILD ghc-6.2.2.ebuild 10603 RMD160 9e03bee744242e2d15b104bb6c9e923206c33303 SHA1 52aace01abb2a583fcc6f4a46fdc2478e07f2bb7 SHA256 38a038236ce7163578330d2a5ee1acfb148319e01840b2208ed2152c13e6ce6c
 EBUILD ghc-6.4.2.ebuild 13708 RMD160 ae6c204451fa0c54ef24a53542f0bb21b1b44f4b SHA1 07682a83fd00e0f6d1b23da2a25ec8d703737086 SHA256 78ed2f5c2d5726bbc79fa25a63238cf732617ce33968c30a7bb201faee29e4c4
 EBUILD ghc-6.6.1.ebuild 12333 RMD160 76cd8b4fe72842cfcd0e2bf20f5c11e788472bd9 SHA1 3e5c4fc62c8fd1e6d12963a852ccea332d4b46a1 SHA256 31e22a90f41f66b127e428788f854e3ac4c08cae3cca2f326e2bb88e670e9de6
 EBUILD ghc-6.6.ebuild 10978 RMD160 f67c1aa1d68f5a277d5d6db6004269f576b95d80 SHA1 7c18bc6d59b1c948651fad042a8928af8aa07a81 SHA256 8e3efaf74dd46ca2bcf3a0f5e75700b7ad4e8083795c3604cc247a0fa6e6d8bf
 EBUILD ghc-6.8.2-r1.ebuild 9147 RMD160 48d75d1fb56e58c4f87e95c6e1664bdabbb3eba4 SHA1 b8510681b9f2535a87f0cbef3768a771071ea1c5 SHA256 90eef3470c0ae305c0248ce2248333e703039a2c16ce6d567a88f9601b28690d
 EBUILD ghc-6.8.2.ebuild 9201 RMD160 0b0685249c09afbb3a03f8c54e458eabf6e0a90f SHA1 9dc6947b948770e710aae71ed2ccb301609b8ffb SHA256 724109ab0e94f8919bb0ea92a96f48be2a10bea5ee339e2b750bf81669e96231
-MISC ChangeLog 34342 RMD160 4aa4a59181e102fad207c38def09aff5850ed90d SHA1 775234b028586836abd85c00b626e2e9ab1f5281 SHA256 a646b5e7d70b8d9ec52fa8ce07f55a212cd86b0d759e8d5524dd0fcf1aa218c1
+MISC ChangeLog 34580 RMD160 1b1ac8ed5ee863cef06948f95758bf61a600b08b SHA1 a078be854489368fcbe011ae4a1bc9d9c36b2126 SHA256 fd1e67859a6bb27cb7c5a1076217ed82f4ff08baaa9f099e3f835653172cebfa
 MISC metadata.xml 442 RMD160 9cfa0af9084477c8a70ecf0ac3fb3093ae0cd602 SHA1 be2833090f093ac1c8fc2f5c6f3f253bdbdd6b96 SHA256 2bacbdfcaea11289949a687626f59f99af8fda9ec495b2c349ce5898d9f0dcd4
diff --git a/dev-lang/ghc/files/ghc-6.12.3-autoconf-2.66-4252.patch b/dev-lang/ghc/files/ghc-6.12.3-autoconf-2.66-4252.patch
new file mode 100644
index 000000000000..7341ca35c97a
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-6.12.3-autoconf-2.66-4252.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/show_bug.cgi?id=337025
+http://hackage.haskell.org/trac/ghc/ticket/4252
+Mon Aug 16 17:24:42 EEST 2010  Ross Paterson <ross@soi.city.ac.uk>
+  * fix FP_CHECK_ALIGNMENT for autoconf 2.66 (fixes #4252)
+  
+  Recent versions of AS_LITERAL_IF don't like *'s.  Fix from
+  
+  http://blog.gmane.org/gmane.comp.sysutils.autoconf.general/month=20100701
+diff -rN -u old-ghc/aclocal.m4 new-ghc/aclocal.m4
+--- old-ghc/aclocal.m4	2010-09-13 21:00:36.288338228 +0300
++++ new-ghc/aclocal.m4	2010-09-13 21:00:37.209338228 +0300
+@@ -141,7 +141,7 @@
+ # A variation of AC_CHECK_SIZEOF for computing the alignment restrictions of a
+ # given type. Defines ALIGNMENT_TYPE.
+ AC_DEFUN([FP_CHECK_ALIGNMENT],
+-[AS_LITERAL_IF([$1], [],
++[AS_LITERAL_IF(m4_translit([[$1]], [*], [p]), [],
+                [AC_FATAL([$0: requires literal arguments])])[]dnl
+ AC_CHECK_TYPE([$1], [], [], [$3])[]dnl
+ m4_pushdef([fp_Cache], [AS_TR_SH([fp_cv_alignment_$1])])[]dnl
diff --git a/dev-lang/ghc/ghc-6.12.3.ebuild b/dev-lang/ghc/ghc-6.12.3.ebuild
index ca82f3918ff6..0ac6369deb47 100644
--- a/dev-lang/ghc/ghc-6.12.3.ebuild
+++ b/dev-lang/ghc/ghc-6.12.3.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.12.3.ebuild,v 1.11 2010/09/09 18:53:01 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.12.3.ebuild,v 1.12 2010/09/13 18:20:56 slyfox Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -219,6 +219,9 @@ src_unpack() {
 		# same with NA on ppc
 		epatch "${FILESDIR}/ghc-6.12.3-ppc-use-libffi-for-foreign-import-wrapper.patch"
 
+		# substitute outdated macros
+		epatch "${FILESDIR}/ghc-6.12.3-autoconf-2.66-4252.patch"
+
 		# as we have changed the build system
 		eautoreconf
 	fi