Restored ~x86-fbsd (bug #283531). Binary built on i686-gentoo-freebsd8.

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

4 files changed, 74 insertions, 5 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 307fd60a647b..ca98988dfd57 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.184 2010/07/14 09:02:35 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.185 2010/07/15 19:13:33 slyfox Exp $
+
+  15 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> ghc-6.12.3.ebuild,
+  +files/ghc-6.12.3-configure-CHOST-freebsd.patch:
+  Restored ~x86-fbsd (bug #283531). Built and tested by Naohiro Aota (naota
+  at freenode://#gentoo-haskell) on i686-gentoo-freebsd8.
 
   14 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> ghc-6.2.2.ebuild,
   ghc-6.4.2.ebuild, ghc-6.6.ebuild, ghc-6.6.1.ebuild, ghc-6.8.2.ebuild,
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 9a4c941e276f..1eeeb783f623 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -10,6 +10,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-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
 AUX ghc-6.12.3-ia64-use-libffi-for-foreign-import-wrapper.patch 683 RMD160 4361e22211960ef347a49e5d0fa53d6337d2c7a6 SHA1 6caf69a755034794f470c3f1e5f48e7453d4e949 SHA256 82f48006c95fb9d01c8618f7457cd2744d7a1fada8c70d25544eefa23cbfde2b
@@ -51,6 +52,7 @@ DIST ghc-bin-6.12.3-alpha.tbz2 106110912 RMD160 f16d9e157eea5491871c19d3b86a4047
 DIST ghc-bin-6.12.3-amd64.tbz2 82390661 RMD160 d1252e69ebab119a3c04c247b0665df5702ada6d SHA1 27b78fce6a21b4050a1f2cdcb4f005ab18750d7d SHA256 6a1c9978c4ad19bb98f70b900afa799f16cfd3e159bb6d51437c264e35f4d6cc
 DIST ghc-bin-6.12.3-ia64-fixed-fiw.tbz2 107618519 RMD160 786f5223e777faabede85e0aa9ca179f8de447e2 SHA1 621e3b6582237672a6ad444988fa6802dac94714 SHA256 6e919c51317aebd6f4c82561a6e279154b4d98966030892df8e5cf2d6deb2128
 DIST ghc-bin-6.12.3-ppc64.tbz2 95781107 RMD160 b089772ef07a33db30084727a286a14e7a519f39 SHA1 2eab23cf6ee89cb188db0d77ae653ddceaf95ba0 SHA256 62c2424c97381be4e0e5f5bf1312a24ebe97c85a52d62bd9e35f991b6ec568f0
+DIST ghc-bin-6.12.3-x86-fbsd.tbz2 78971971 RMD160 e8a852e260d78bf5e3851952d5fb850f46ca89b1 SHA1 c08e81718202513f16219de29880271676473461 SHA256 8c39359b3dad6216a1b92464468f9c554d5bae546b037f57d7dccb8ecd5f9f7a
 DIST ghc-bin-6.12.3-x86.tbz2 82262946 RMD160 8256df61e6998d819c7d40d613037c5f313c948b SHA1 73dc4422bbabf5c0d8de4a6672db4b3fedd42f9c SHA256 0d74a18473d6303e8818a6bd1de87f6dfd86466e7d967d68707a6c255a96945d
 DIST ghc-bin-6.2.2-r1-ppc.tbz2 21018465 RMD160 4dda12e11ce31d395d1085e441171580832003f7 SHA1 0b0f3c5a77612a52317914730c0ecb15bd75d719 SHA256 453babea6a9c3d3382b9987f5e40d184dd3e591a7b1d1f6bd6d41984d94f4dd4
 DIST ghc-bin-6.2.2-r1-sparc.tbz2 16189582 RMD160 0ba8ff87c91abcd43988c21df8537eec0932c6a3 SHA1 404333d666256164bf056f6144f0b21094719e1b SHA256 5d225e05e73cb85500b4a1860a4dd82adbb9edc4791d087341b4458e70022cc3
@@ -85,12 +87,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 12197 RMD160 8dd49bf3e2d898bed796a3b6f02aae7cc3fa8393 SHA1 01dd85aff599f429352e7c09b190f2f4e94df5be SHA256 70ab6f3bea1ae8514db893405f05bce05e1be537b28c26078b6341d5ed723e36
 EBUILD ghc-6.12.1.ebuild 11652 RMD160 be2f744677826a3829f3209a0c4f7aaddc397868 SHA1 4dba47dbd13960d7eb65bc8873f2102c0a62f580 SHA256 1897ff08258c8b47bce02733c020477bcb17e08134c7d3a8d3197943f509c083
-EBUILD ghc-6.12.3.ebuild 13183 RMD160 7e66627bc70d03085981c8600638b8a00433ed76 SHA1 9a96341e6344dcec265c7e69f17084df83973382 SHA256 816cd01a1f4252c60019aeb9e8961a17be7ddae93eb12583f8e06b40d4729ba0
+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
 EBUILD ghc-6.4.2.ebuild 13558 RMD160 2bfad1d139edfa46a496f77786fa7ed08f259bba SHA1 cc8c5f23c1e3c9625176bb3783459e094961f9f6 SHA256 a176a28eb009d3d13b908303f277cb39e231d58a5716a18b34125e4eb7951da6
 EBUILD ghc-6.6.1.ebuild 12183 RMD160 3261a2bbff0a47859c5519f4607ebf6cbdd803ab SHA1 a8d456c4c2e8f9cab76f88a4606b0ce7bc334605 SHA256 7af7176e056f15a81bc27584f67afe26e74daabbcec4b37c89f4f509acfcc70f
 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 33015 RMD160 45d0c26091e71ef5431f08349bbbb213bfa00fd2 SHA1 d52f313c2bf6e0c297c6b34abec8a17c23556fc3 SHA256 9da0806bbc1d374a2425f3a74f1dda3c207b8380c8070dc234148c4926f73bfc
+MISC ChangeLog 33274 RMD160 cc3948743dcdfa0db624703338b0561bd30c968c SHA1 049c600db9b82c48fa7375ef0e98b450c91c6c28 SHA256 2bcc4c8ece6cae48ec5cd0652a9e1e243634d997fe9db9b1b411d09ca8b4bbfb
 MISC metadata.xml 442 RMD160 9cfa0af9084477c8a70ecf0ac3fb3093ae0cd602 SHA1 be2833090f093ac1c8fc2f5c6f3f253bdbdd6b96 SHA256 2bacbdfcaea11289949a687626f59f99af8fda9ec495b2c349ce5898d9f0dcd4
diff --git a/dev-lang/ghc/files/ghc-6.12.3-configure-CHOST-freebsd.patch b/dev-lang/ghc/files/ghc-6.12.3-configure-CHOST-freebsd.patch
new file mode 100644
index 000000000000..3600a5833de4
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-6.12.3-configure-CHOST-freebsd.patch
@@ -0,0 +1,58 @@
+gcc on FreeBSD/Gentoo/x86 has 'i686-gentoo-freebsd7.2' triplet, but ghc likes 'i386-unknown-freebsd'
+Mangle -gentoo- to -unknown-, mangle '-freebsd7.2' (and other numerics) to '-freebsd'
+Thanks to naota for the report and testing.
+diff --git a/aclocal.m4 b/aclocal.m4
+index f401860..7f93ebf 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -1333,7 +1333,7 @@ case "$1" in
+ # converts vendor from gnu to ghc naming, and assigns the result to $target_var
+ AC_DEFUN([GHC_CONVERT_VENDOR],[
+ case "$1" in
+-  pc)
++  pc|gentoo)
+     $2="unknown"
+     ;;
+   *)
+@@ -1354,6 +1354,10 @@ case "$1" in
+   freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku)
+     $2="$1"
+     ;;
++  # for things like freebsd7.2
++  freebsd*)
++    $2="freebsd"
++    ;;
+   *)
+     echo "Unknown OS $1"
+     exit 1
+diff --git a/configure.ac b/configure.ac
+index 0360fa5..0a1ce25 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -225,7 +225,7 @@ then
+                 echo "Bootstrapping GHC is a cross compiler. This probably isn't going to work"
+         fi
+ fi
+-build=`echo "$build" | sed -e 's/linux-gnu/linux/' -e 's/-pc-/-unknown-/'`
++build=`echo "$build" | sed -e 's/linux-gnu/linux/' -e 's/-pc-/-unknown-/' -e 's/-gentoo-/-unknown-/' -e 's/freebsd.*$/freebsd/'`
+ [build=`echo "$build" | sed -e 's/i[4-6]86/i386/'`] # escaping square bracket
+ 
+ # We have to run these unconditionally, but we may discard their
+@@ -260,7 +260,7 @@ else
+     GHC_CONVERT_VENDOR([$build_vendor], [BuildVendor])
+     GHC_CONVERT_OS([$build_os], [BuildOS])
+ fi
+-host=`echo "$host" | sed -e 's/linux-gnu/linux/' -e 's/-pc-/-unknown-/'`
++host=`echo "$host" | sed -e 's/linux-gnu/linux/' -e 's/-pc-/-unknown-/' -e 's/-gentoo-/-unknown-/' -e 's/freebsd.*$/freebsd/'`
+ [host=`echo "$host" | sed -e 's/i[4-6]86/i386/'`] # escaping square bracket
+ 
+ if test "$host_alias" = ""
+@@ -282,7 +282,7 @@ else
+     GHC_CONVERT_VENDOR([$host_vendor], [HostVendor])
+     GHC_CONVERT_OS([$host_os], [HostOS])
+ fi
+-target=`echo "$target" | sed -e 's/linux-gnu/linux/' -e 's/-pc-/-unknown-/'`
++target=`echo "$target" | sed -e 's/linux-gnu/linux/' -e 's/-pc-/-unknown-/' -e 's/-gentoo-/-unknown-/' -e 's/freebsd.*$/freebsd/'`
+ [target=`echo "$target" | sed -e 's/i[4-6]86/i386/'`] # escaping square bracket
+ 
+ if test "$target_alias" = ""
diff --git a/dev-lang/ghc/ghc-6.12.3.ebuild b/dev-lang/ghc/ghc-6.12.3.ebuild
index 401d561f6668..c356b57165d9 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.7 2010/07/14 09:02:35 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.12.3.ebuild,v 1.8 2010/07/15 19:13:33 slyfox Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -42,11 +42,14 @@ arch_binaries="$arch_binaries ia64?  ( http://code.haskell.org/~slyfox/ghc-ia64/
 #arch_binaries="$arch_binaries sparc? ( http://haskell.org/~duncan/ghc/ghc-bin-${PV}-sparc.tbz2 )"
 arch_binaries="$arch_binaries ppc64? ( mirror://gentoo/ghc-bin-${PV}-ppc64.tbz2 )"
 
+# various ports:
+arch_binaries="$arch_binaries x86-fbsd? ( http://code.haskell.org/~slyfox/ghc-x86-fbsd/ghc-bin-${PV}-x86-fbsd.tbz2 )"
+
 SRC_URI="!binary? ( http://darcs.haskell.org/download/dist/${PV}/${P}-src.tar.bz2 )
 	!ghcbootstrap? ( $arch_binaries )"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~x86 ~x86-fbsd"
 IUSE="binary doc ghcbootstrap"
 
 RDEPEND="
@@ -198,6 +201,7 @@ src_unpack() {
 
 		epatch "${FILESDIR}/ghc-6.12.1-configure-CHOST.patch"
 		epatch "${FILESDIR}/ghc-6.12.2-configure-CHOST-part2.patch"
+		epatch "${FILESDIR}/ghc-6.12.3-configure-CHOST-freebsd.patch"
 
 		# -r and --relax are incompatible
 		epatch "${FILESDIR}/ghc-6.12.3-ia64-fixed-relax.patch"