summaryrefslogtreecommitdiff
path: root/lang/ghc/files/patch-configure
diff options
context:
space:
mode:
authorAshish SHUKLA <ashish@FreeBSD.org>2011-05-09 05:28:57 +0000
committerAshish SHUKLA <ashish@FreeBSD.org>2011-05-09 05:28:57 +0000
commit0c76a8384fc1de4958eb1228befbee727f00c596 (patch)
tree28680b3da252da7f45a2d25108e4e2a6e41a77e5 /lang/ghc/files/patch-configure
parentupdate to 1.4.1 (diff)
- Please welcome GHC 7.0.3
GHC in the ports tree has been updated to 7.0.3 and all other Haskell ports are also updated to their corresponding Haskell Platform versions, or latest versions. We would like to acknowledge the support of the FreeBSD Donations Team and Eotvos Lorand University, Faculty of Informatics who contributed to the server that we used for testing. We would also like to thank all the testers who tested FreeBSD Haskell ports and provided their feedback. PR: ports/156642 Approved by: tabthorpe (mentor) Obtained from: FreeBSD Haskell
Notes
Notes: svn path=/head/; revision=273838
Diffstat (limited to 'lang/ghc/files/patch-configure')
-rw-r--r--lang/ghc/files/patch-configure83
1 files changed, 83 insertions, 0 deletions
diff --git a/lang/ghc/files/patch-configure b/lang/ghc/files/patch-configure
new file mode 100644
index 000000000000..18cd7e9742bc
--- /dev/null
+++ b/lang/ghc/files/patch-configure
@@ -0,0 +1,83 @@
+
+$FreeBSD$
+
+--- configure.orig
++++ configure
+@@ -3312,6 +3312,9 @@
+ vax)
+ BuildArch="vax"
+ ;;
++ amd64)
++ BuildArch="x86_64"
++ ;;
+ x86_64)
+ BuildArch="x86_64"
+ ;;
+@@ -3330,7 +3333,7 @@
+ BuildOS="linux"
+ ;;
+ # As far as I'm aware, none of these have relevant variants
+- freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku)
++ freebsd*|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku)
+ BuildOS="$build_os"
+ ;;
+ *)
+@@ -3560,7 +3563,7 @@
+
+ checkArch() {
+ case $1 in
+- alpha|arm|hppa|hppa1_1|i386|ia64|m68k|mips|mipseb|mipsel|powerpc|powerpc64|rs6000|s390|sparc|sparc64|vax|x86_64)
++ alpha|arm|hppa|hppa1_1|i386|ia64|m68k|mips|mipseb|mipsel|powerpc|powerpc64|rs6000|s390|sparc|sparc64|vax|x86_64|amd64)
+ ;;
+ *)
+ echo "Unknown arch $1"
+@@ -3571,7 +3574,7 @@
+
+ checkVendor() {
+ case $1 in
+- dec|unknown|hp|apple|next|sun|sgi|ibm)
++ dec|unknown|hp|apple|next|sun|sgi|ibm|portbld)
+ ;;
+ *)
+ echo "Unknown vendor $1"
+@@ -3582,7 +3585,7 @@
+
+ checkOS() {
+ case $1 in
+- linux|freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku)
++ linux|freebsd*|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku)
+ ;;
+ *)
+ echo "Unknown OS '$1'"
+@@ -3621,6 +3624,9 @@
+ checkVendor "$TargetVendor"
+ checkOS "$TargetOS"
+
++bootstrap_target=`echo "$bootstrap_target" |sed -e 's/-unknown-/-portbld-/g' -e 's/x86_64/amd64/g'`
++build=`echo "$build" |sed -e 's/\(freebsd\)[[:digit:].]*$/\1/g'`
++
+ # Verify that the installed (bootstrap) GHC is capable of generating
+ # code for the requested build platform.
+ if test "$build" != "$bootstrap_target"
+@@ -9533,7 +9539,7 @@
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lrt $LIBS"
++LIBS="$LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -9564,11 +9570,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
+ $as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
+ if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then :
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBRT 1
+-_ACEOF
+-
+- LIBS="-lrt $LIBS"
++ LIBS="$LIBS"
+
+ fi
+