X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fdarwin.sh;h=ffca869c9ce8e2d9c2d3bf87ac3c2d998bafba6c;hb=102b13d314016f7ec14c00406088a88475fe52db;hp=1d27f339ab52ab2452c31b8cc1ceca48d4498a96;hpb=77397dcf62ceeeddb037fe9f0cc462d1d798e190;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/darwin.sh b/hints/darwin.sh
index 1d27f33..ffca869 100644
--- a/hints/darwin.sh
+++ b/hints/darwin.sh
@@ -89,12 +89,11 @@ fi
 ;;
 esac
 
-# -pipe: makes compilation go faster.
 # -fno-common because common symbols are not allowed in MH_DYLIB
 # -DPERL_DARWIN: apparently the __APPLE__ is not sanctioned by Apple
 # as the way to differentiate Mac OS X.  (The official line is that
 # *no* cpp symbol does differentiate Mac OS X.)
-ccflags="${ccflags} -pipe -fno-common -DPERL_DARWIN"
+ccflags="${ccflags} -fno-common -DPERL_DARWIN"
 
 # At least on Darwin 1.3.x:
 #
@@ -138,8 +137,27 @@ esac
 ld='cc';
 so='dylib';
 dlext='bundle';
-dlsrc='dl_dyld.xs'; usedl='define';
-cccdlflags=' '; # space, not empty, because otherwise we get -fpic
+usedl='define';
+
+# 10.4 can use dlopen.
+# 10.4 broke poll().
+case "$osvers" in
+[1-7].*)
+    dlsrc='dl_dyld.xs';
+    ;;
+*)
+    dlsrc='dl_dlopen.xs';
+    d_poll='undef';
+    i_poll='undef';
+    ;;
+esac
+
+case "$ccdlflags" in		# If passed in from command line, presume user knows best
+'')
+   cccdlflags=' '; # space, not empty, because otherwise we get -fpic
+;;
+esac
+
 # Perl bundles do not expect two-level namespace, added in Darwin 1.4.
 # But starting from perl 5.8.1/Darwin 7 the default is the two-level.
 case "$osvers" in
@@ -154,10 +172,11 @@ case "$osvers" in
    ldflags="${ldflags} -flat_namespace"
    lddlflags="${ldflags} -bundle -undefined suppress"
    ;;
-*) lddlflags="${ldflags} -bundle -undefined dynamic_lookup"
+*) 
+   lddlflags="${ldflags} -bundle -undefined dynamic_lookup"
    case "$ld" in
-   *MACOSX_DEVELOPMENT_TARGET*) ;;
-   *) ld="env MACOSX_DEPLOYMENT_TARGET=10.3 ${ld}" ;;
+       *MACOSX_DEVELOPMENT_TARGET*) ;;
+       *) ld="env MACOSX_DEPLOYMENT_TARGET=10.3 ${ld}" ;;
    esac
    ;;
 esac
@@ -176,6 +195,47 @@ case "$ldflags" in
 esac
 EOCBU
 
+# 64-bit addressing support. Currently strictly experimental. DFD 2005-06-06
+if [ "$use64bitall" ]
+then
+case "$osvers" in
+[1-7].*)
+     cat <<EOM >&4
+
+
+
+*** 64-bit addressing is not supported for Mac OS X versions
+*** below 10.4 ("Tiger") or Darwin versions below 8. Please try
+*** again without -D64bitall. (-D64bitint will work, however.)
+
+EOM
+     exit 1
+  ;;
+*)
+    cat <<EOM >&4
+
+
+
+*** Perl 64-bit addressing support is experimental for Mac OS X
+*** 10.4 ("Tiger") and Darwin version 8. System V IPC is disabled
+*** due to problems with the 64-bit versions of msgctl, semctl,
+*** and shmctl. You should also expect the following test failures:
+***
+***    ext/threads/shared/t/wait (threaded builds only)
+
+EOM
+    for var in ccflags cppflags ld ldflags
+    do
+       eval $var="\$${var}\ -arch\ ppc64"
+    done
+
+    [ "$d_msgctl" ] || d_msgctl='undef'
+    [ "$d_semctl" ] || d_semctl='undef'
+    [ "$d_shmctl" ] || d_shmctl='undef'
+    ;;
+esac
+fi
+
 ##
 # System libraries
 ##
@@ -183,10 +243,18 @@ EOCBU
 # vfork works
 usevfork='true';
 
+# malloc wrap works
+case "$usemallocwrap" in
+'') usemallocwrap='define' ;;
+esac
+
 # our malloc works (but allow users to override)
 case "$usemymalloc" in
 '') usemymalloc='n' ;;
 esac
+# However sbrk() returns -1 (failure) somewhere in lib/unicore/mktables at
+# around 14M, so we need to use system malloc() as our sbrk()
+malloc_cflags='ccflags="-DUSE_PERL_SBRK -DPERL_SBRK_VIA_MALLOC $ccflags"'
 
 # Locales aren't feeling well.
 LC_ALL=C; export LC_ALL;
@@ -220,6 +288,10 @@ esac
 # really need ODBM_FIle, though, so let's just hint ODBM away.
 i_dbm=undef;
 
+# Configure doesn't detect ranlib on Tiger properly.
+# NeilW says this should be acceptable on all darwin versions.
+ranlib='ranlib'
+
 ##
 # Build process
 ##