diff options
| author | minskim <minskim> | 2009-11-19 03:05:57 +0000 |
|---|---|---|
| committer | minskim <minskim> | 2009-11-19 03:05:57 +0000 |
| commit | dbb6da6d74d05dac6865831a9d81e58cb6aab8a2 (patch) | |
| tree | 9231bb0470d91acaf8e6c21f81b873b2988c3235 /lang/ocaml/patches/patch-at | |
| parent | 762b6459de83b4296c8fa7594925558aeda9ea16 (diff) | |
| download | pkgsrc-dbb6da6d74d05dac6865831a9d81e58cb6aab8a2.tar.gz | |
Let ocaml's configure recognize 64-bit Darwin 10.
Diffstat (limited to 'lang/ocaml/patches/patch-at')
| -rw-r--r-- | lang/ocaml/patches/patch-at | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/lang/ocaml/patches/patch-at b/lang/ocaml/patches/patch-at index c36246e2f59..ac223f0430a 100644 --- a/lang/ocaml/patches/patch-at +++ b/lang/ocaml/patches/patch-at @@ -1,8 +1,8 @@ -$NetBSD: patch-at,v 1.17 2009/09/07 21:48:13 tonio Exp $ +$NetBSD: patch-at,v 1.18 2009/11/19 03:05:57 minskim Exp $ ---- configure.orig 2009-05-19 15:23:47.000000000 +0200 -+++ configure 2009-05-21 10:54:30.000000000 +0200 -@@ -516,7 +516,7 @@ +--- configure.orig 2009-05-20 08:33:09.000000000 -0700 ++++ configure +@@ -516,7 +516,7 @@ if test $withsharedlibs = "yes"; then mksharedlib="$flexlink" mkmaindll="$flexlink -maindll" shared_libraries_supported=true;; @@ -11,7 +11,7 @@ $NetBSD: patch-at,v 1.17 2009/09/07 21:48:13 tonio Exp $ cmxs="cmxs" sharedcccompopts="-fPIC" mksharedlib="$bytecc -shared" -@@ -615,12 +615,13 @@ +@@ -615,12 +615,13 @@ case "$host" in alpha*-*-netbsd*) arch=alpha; system=netbsd;; alpha*-*-openbsd*) arch=alpha; system=openbsd;; sparc*-*-sunos4.*) arch=sparc; system=sunos;; @@ -26,7 +26,7 @@ $NetBSD: patch-at,v 1.17 2009/09/07 21:48:13 tonio Exp $ i[3456]86-*-nextstep*) arch=i386; system=nextstep;; i[3456]86-*-solaris*) if $arch64; then arch=amd64; system=solaris -@@ -629,6 +630,7 @@ +@@ -629,6 +630,7 @@ case "$host" in fi;; i[3456]86-*-beos*) arch=i386; system=beos;; i[3456]86-*-cygwin*) arch=i386; system=cygwin;; @@ -34,15 +34,17 @@ $NetBSD: patch-at,v 1.17 2009/09/07 21:48:13 tonio Exp $ i[3456]86-*-darwin*) if $arch64; then arch=amd64; system=macosx else -@@ -655,6 +657,7 @@ +@@ -655,7 +657,9 @@ case "$host" in x86_64-*-freebsd*) arch=amd64; system=freebsd;; x86_64-*-netbsd*) arch=amd64; system=netbsd;; x86_64-*-openbsd*) arch=amd64; system=openbsd;; + x86_64-*-solaris*) arch=amd64; system=solaris;; x86_64-*-darwin9.5) arch=amd64; system=macosx;; ++ x86_64-*-darwin1[0-9]*) arch=amd64; system=macosx;; esac -@@ -756,6 +759,7 @@ + # Some platforms exist both in 32-bit and 64-bit variants, not distinguished +@@ -756,6 +760,7 @@ case "$arch,$model,$system" in case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;; amd64,*,linux) profiling='prof';; amd64,*,gnu) profiling='prof';; @@ -50,7 +52,7 @@ $NetBSD: patch-at,v 1.17 2009/09/07 21:48:13 tonio Exp $ *) profiling='noprof';; esac -@@ -1144,6 +1148,8 @@ +@@ -1144,6 +1149,8 @@ if test "$pthread_wanted" = "yes"; then pthread_caml_link="-cclib -lpthread -cclib -lposix4";; *-*-freebsd*) pthread_link="-pthread" pthread_caml_link="-cclib -pthread";; @@ -59,7 +61,7 @@ $NetBSD: patch-at,v 1.17 2009/09/07 21:48:13 tonio Exp $ *-*-openbsd*) pthread_link="-pthread" pthread_caml_link="-cclib -pthread";; *) pthread_link="-lpthread" -@@ -1195,6 +1201,7 @@ +@@ -1195,6 +1202,7 @@ fi x11_include="not found" x11_link="not found" @@ -67,7 +69,7 @@ $NetBSD: patch-at,v 1.17 2009/09/07 21:48:13 tonio Exp $ for dir in \ $x11_include_dir \ \ -@@ -1241,6 +1248,7 @@ +@@ -1247,6 +1255,7 @@ do break fi done @@ -75,7 +77,7 @@ $NetBSD: patch-at,v 1.17 2009/09/07 21:48:13 tonio Exp $ if test "$x11_include" = "not found"; then x11_try_lib_dir='' -@@ -1335,31 +1343,8 @@ +@@ -1341,31 +1350,8 @@ dbm_include="not found" dbm_link="not found" use_gdbm_ndbm=no @@ -109,7 +111,7 @@ $NetBSD: patch-at,v 1.17 2009/09/07 21:48:13 tonio Exp $ if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then echo "NDBM not found, the \"dbm\" library will not be supported." else -@@ -1369,8 +1354,8 @@ +@@ -1375,8 +1361,8 @@ else else dbm_include="-I$dbm_include" fi |