summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2011-08-03 12:35:20 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2011-08-03 12:35:20 +0000
commit7be232b1d9ed3a546c1b8b7ae3d0537b5707dc69 (patch)
tree6522e28b5269d7d8263e46305628de23d6a4fe29 /dev-lang/ghc/files
parentPatches to support gmcp and other. Bug #361311 (diff)
downloadgentoo-2-7be232b1d9ed3a546c1b8b7ae3d0537b5707dc69.tar.gz
gentoo-2-7be232b1d9ed3a546c1b8b7ae3d0537b5707dc69.tar.bz2
gentoo-2-7be232b1d9ed3a546c1b8b7ae3d0537b5707dc69.zip
Version bump. Bump request by Alexandru Scvortov (bug #352498)
(Portage version: 2.1.10.10/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'dev-lang/ghc/files')
-rw-r--r--dev-lang/ghc/files/ghc-7.0.2-CHOST.patch89
-rw-r--r--dev-lang/ghc/files/ghc-7.0.4-CHOST-prefix.patch17
-rw-r--r--dev-lang/ghc/files/ghc-7.0.4-CHOST-softfloat.patch14
-rw-r--r--dev-lang/ghc/files/ghc-7.0.4-darwin8.patch18
4 files changed, 138 insertions, 0 deletions
diff --git a/dev-lang/ghc/files/ghc-7.0.2-CHOST.patch b/dev-lang/ghc/files/ghc-7.0.2-CHOST.patch
new file mode 100644
index 000000000000..7479149a9efa
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-7.0.2-CHOST.patch
@@ -0,0 +1,89 @@
+Tue Mar 1 08:41:08 EET 2011 Sergei Trofimovich <slyfox@community.haskell.org>
+ * configure: triplet: accept i486 CPU (and more), more vendors and OSes
+
+ Gentoo has interesting ports:
+
+ - freebsd with following triplet:
+ ./configure --build=i686-gentoo-freebsd8 --host=i686-gentoo-freebsd8 --host=i686-gentoo-freebsd8
+ should be recognized as 'i386-unknown-freebsd'
+ - 'pc' vendor along with non-'i386' is very common:
+ ./configure --build=i486-pc-linux-gnu --i486-pc-linux-gnu --host=i486-pc-linux-gnu
+ ./configure --build=i686-pc-linux-gnu --i686-pc-linux-gnu --host=i686-pc-linux-gnu
+ should be recognized as 'i386-unknown-linux'
+
+ Patch adds:
+
+ - 'pc' vendor (maps to 'unknown')
+ - 'gentoo' vendor (maps to 'unknown')
+ - 'i486', 'i586', 'i686' CPUs (maps to 'i386')
+ - 'freebsd8' OS (maps to 'freebsd')
+diff -rN -u old-ghc/aclocal.m4 new-ghc/aclocal.m4
+--- old-ghc/aclocal.m4 2011-03-04 13:26:18.512776569 +0200
++++ new-ghc/aclocal.m4 2011-03-04 13:26:18.606776569 +0200
+@@ -1458,7 +1458,7 @@
+ hppa*)
+ $2="hppa"
+ ;;
+- i386)
++ i386|i486|i586|i686)
+ $2="i386"
+ ;;
+ ia64)
+@@ -1511,7 +1511,15 @@
+ # --------------------------------
+ # converts vendor from gnu to ghc naming, and assigns the result to $target_var
+ AC_DEFUN([GHC_CONVERT_VENDOR],[
+-$2="$1"
++ case "$1" in
++ pc|gentoo) # like i686-pc-linux-gnu and i686-gentoo-freebsd8
++ $2="unknown"
++ ;;
++ *)
++ #pass thru by default
++ $2="$1"
++ ;;
++ esac
+ ])
+
+ # GHC_CONVERT_OS(os, target_var)
+@@ -1526,6 +1534,9 @@
+ freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku)
+ $2="$1"
+ ;;
++ freebsd8) # like i686-gentoo-freebsd8
++ $2="freebsd"
++ ;;
+ *)
+ echo "Unknown OS $1"
+ exit 1
+Tue Mar 1 21:40:18 EET 2011 Sergei Trofimovich <slyfox@community.haskell.org>
+ * configure: amend sanity check
+
+ As we perform some mangling of original --build/--host/--target
+ params we should check the result of mangling against desired triplet,
+ not originally passed by user.
+
+ Patch also adds mangled triplets to the output.
+diff -rN -u old-ghc/configure.ac new-ghc/configure.ac
+--- old-ghc/configure.ac 2011-03-04 13:26:20.005776569 +0200
++++ new-ghc/configure.ac 2011-03-04 13:26:20.319776569 +0200
+@@ -288,7 +288,7 @@
+
+ # Verify that the installed (bootstrap) GHC is capable of generating
+ # code for the requested build platform.
+-if test "$build" != "$bootstrap_target"
++if test "$BuildPlatform" != "$bootstrap_target"
+ then
+ echo "This GHC (${WithGhc}) does not generate code for the build platform"
+ echo " GHC target platform : $bootstrap_target"
+@@ -296,6 +296,10 @@
+ exit 1
+ fi
+
++echo "GHC build : $BuildPlatform"
++echo "GHC host : $HostPlatform"
++echo "GHC target : $TargetPlatform"
++
+ AC_SUBST(BuildPlatform)
+ AC_SUBST(HostPlatform)
+ AC_SUBST(TargetPlatform)
diff --git a/dev-lang/ghc/files/ghc-7.0.4-CHOST-prefix.patch b/dev-lang/ghc/files/ghc-7.0.4-CHOST-prefix.patch
new file mode 100644
index 000000000000..682c573c90a6
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-7.0.4-CHOST-prefix.patch
@@ -0,0 +1,17 @@
+Strip versioning components from *HOST for Darwin and Solaris
+
+--- aclocal.m4
++++ aclocal.m4
+@@ -1358,6 +1358,12 @@
+ freebsd*)
+ $2="freebsd"
+ ;;
++ darwin*)
++ $2="darwin"
++ ;;
++ solaris2.*)
++ $2="solaris2"
++ ;;
+ *)
+ echo "Unknown OS $1"
+ exit 1
diff --git a/dev-lang/ghc/files/ghc-7.0.4-CHOST-softfloat.patch b/dev-lang/ghc/files/ghc-7.0.4-CHOST-softfloat.patch
new file mode 100644
index 000000000000..7b726d2f2116
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-7.0.4-CHOST-softfloat.patch
@@ -0,0 +1,14 @@
+diff --git a/aclocal.m4 b/aclocal.m4
+index b10eeec..13988fe 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -1487,6 +1487,9 @@ AC_DEFUN([GHC_CONVERT_VENDOR],[
+ pc|gentoo) # like i686-pc-linux-gnu and i686-gentoo-freebsd8
+ $2="unknown"
+ ;;
++ softfloat) # like armv5tel-softfloat-linux-gnueabi
++ $2="unknown"
++ ;;
+ *)
+ #pass thru by default
+ $2="$1"
diff --git a/dev-lang/ghc/files/ghc-7.0.4-darwin8.patch b/dev-lang/ghc/files/ghc-7.0.4-darwin8.patch
new file mode 100644
index 000000000000..bfbee41b4f93
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-7.0.4-darwin8.patch
@@ -0,0 +1,18 @@
+Workaround headers problem in Darwin 8 as well.
+
+--- rts/PosixSource.h
++++ rts/PosixSource.h
+@@ -11,6 +11,13 @@
+
+ #include <ghcplatform.h>
+
++#if defined(darwin_HOST_OS)
++/* unfortunately the hack below only works for Darwin 9 and
++ * above, so as hack include sys/types early (before setting
++ * _POSIX_C_SOURCE) (this obviously obsoletes the hack below) */
++#include <sys/types.h>
++#endif
++
+ #if defined(freebsd_HOST_OS)
+ #define _POSIX_C_SOURCE 200112L
+ #define _XOPEN_SOURCE 600