X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fdarwin.sh;h=5bf23d2404da2a16c62c0021a8899147af6a7b67;hb=f9655257b2ff49a04bcf20c32c0590f5bc23526e;hp=166130c24b69e03613d401a2853ac29856bf3f85;hpb=b1eb02cdbfc9177f8cf68ec83a535a18511cbf7d;p=p5sagit%2Fp5-mst-13.2.git diff --git a/hints/darwin.sh b/hints/darwin.sh index 166130c..5bf23d2 100644 --- a/hints/darwin.sh +++ b/hints/darwin.sh @@ -1,41 +1,39 @@ ## # Darwin (Mac OS) hints -# Wilfredo Sanchez +# Wilfredo Sanchez ## ## # Paths ## +# Configure hasn't figured out the version number yet. Bummer. +perl_revision=`awk '/define[ ]+PERL_REVISION/ {print $3}' $src/patchlevel.h` +perl_version=`awk '/define[ ]+PERL_VERSION/ {print $3}' $src/patchlevel.h` +perl_subversion=`awk '/define[ ]+PERL_SUBVERSION/ {print $3}' $src/patchlevel.h` +version="${perl_revision}.${perl_version}.${perl_subversion}" + +# This was previously used in all but causes three cases +# (no -Ddprefix=, -Dprefix=/usr, -Dprefix=/some/thing/else) +# but that caused too much grief. +# vendorlib="/System/Library/Perl/${version}"; # Apple-supplied modules + # BSD paths case "$prefix" in -'') + ''|'/usr') # Default install; use non-system directories prefix='/usr/local'; # Built-in perl uses /usr - siteprefix='/usr/local'; - vendorprefix='/usr/local'; usevendorprefix='define'; - + siteprefix=''/usr/local'; # Where to put modules. - privlib='/Library/Perl'; # Built-in perl uses /System/Library/Perl - sitelib='/Library/Perl'; - vendorlib='/Network/Library/Perl'; + sitelib="/Library/Perl/${version}"; # FIXME: Want "/Network/Perl/${version}" also + # 4BSD uses ${prefix}/share/man, not ${prefix}/man. + man1dir='/usr/share/man/man1'; + man3dir='/usr/share/man/man3'; ;; -'/usr') - # We are building/replacing the built-in perl - siteprefix='/usr/local'; - vendorprefix='/usr/local'; usevendorprefix='define'; - - # Where to put modules. - privlib='/System/Library/Perl'; - sitelib='/Library/Perl'; - vendorlib='/Network/Library/Perl'; + *) # Anything else; use non-system directories ;; esac -# 4BSD uses ${prefix}/share/man, not ${prefix}/man. -man1dir="${prefix}/share/man/man1"; -man3dir="${prefix}/share/man/man3"; - ## # Tool chain settings ## @@ -46,18 +44,30 @@ archname='darwin'; # nm works. usenm='true'; -# Optimize. -if [ "x$optimize" = 'x' ]; then - optimize='-O3' +case "$optimize" in +'') +# Optimizing for size also mean less resident memory usage on the part +# of Perl. Apple asserts that this is a more important optimization than +# saving on CPU cycles. Given that memory speed has not increased at +# pace with CPU speed over time (on any platform), this is probably a +# reasonable assertion. +if [ -z "${optimize}" ]; then + case "`${cc:-gcc} -v 2>&1`" in + *"gcc version 3."*) optimize='-Os' ;; + *) optimize='-O3' ;; + esac +else + optimize='-O3' fi +;; +esac # -pipe: makes compilation go faster. -# -fno-common: we don't like commons. Common symbols are not allowed -# in MH_DYLIB binaries, which is what libperl.dylib is. You will fail -# to link without that option, unless you otherwise eliminate all commons -# by, for example, initializing all globals. -# --Fred Sánchez -ccflags="${ccflags} -pipe -fno-common" +# -fno-common because common symbols are not allowed in MH_DYLIB +# -DDARWIN: 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 -DDARWIN" # At least on Darwin 1.3.x: # @@ -76,17 +86,24 @@ ccflags="${ccflags} -pipe -fno-common" # seems to work. INT64_MIN seems to be similarly broken. # -- Nicholas Clark, Ken Williams, and Edward Moy # -ccflags="${ccflags} -DINT32_MIN_BROKEN -DINT64_MIN_BROKEN" +# This seems to have been fixed since at least Mac OS X 10.1.3, +# stdint.h defining INT32_MIN as (-INT32_MAX-1) +# -- Edward Moy +# +case "$(grep '^#define INT32_MIN' /usr/include/stdint.h)" in + *-2147483648) ccflags="${ccflags} -DINT32_MIN_BROKEN -DINT64_MIN_BROKEN" ;; +esac -# cppflags='-traditional-cpp'; -# avoid Apple's cpp precompiler, better for extensions +# Avoid Apple's cpp precompiler, better for extensions cppflags="${cppflags} -no-cpp-precomp" -# and ccflags needs them aswell since we don't use cpp directly -ccflags="${ccflags} -no-cpp-precomp" + +# This is necessary because perl's build system doesn't +# apply cppflags to cc compile lines as it should. +ccflags="${ccflags} ${cppflags}" # Known optimizer problems. -case "`cc -v`" in -*"3.1 20020105"*) toke_cflags='optimize=""' ;; +case "`cc -v 2>&1`" in + *"3.1 20020105"*) toke_cflags='optimize=""' ;; esac # Shared library extension is .dylib. @@ -96,16 +113,41 @@ so='dylib'; dlext='bundle'; dlsrc='dl_dyld.xs'; usedl='define'; cccdlflags=' '; # space, not empty, because otherwise we get -fpic -# ldflag: -flat_namespace is only available since OS X 10.1 (Darwin 1.4.1) -# - but not in 10.0.x (Darwin 1.3.x) -# -- Kay Roepke +# 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 -1.[0-3].*) ;; -*) ldflags="${ldflags} -flat_namespace" ;; +1.[0-3].*) + lddlflags="${ldflags} -bundle -undefined suppress" + ;; +1.*) + ldflags="${ldflags} -flat_namespace" + lddlflags="${ldflags} -bundle -undefined suppress" + ;; +[2-6].*) + ldflags="${ldflags} -flat_namespace" + lddlflags="${ldflags} -bundle -undefined suppress" + ;; +*) lddlflags="${ldflags} -bundle -undefined dynamic_lookup" + case "$ld" in + *MACOSX_DEVELOPMENT_TARGET*) ;; + *) ld="MACOSX_DEPLOYMENT_TARGET=10.3 ${ld}" ;; + esac + ;; esac -lddlflags="${ldflags} -bundle -undefined suppress"; ldlibpthname='DYLD_LIBRARY_PATH'; -useshrplib='true'; + +# useshrplib=true results in much slower startup times. +# 'false' is the default value. Use Configure -Duseshrplib to override. + +cat > UU/archname.cbu <<'EOCBU' +# This script UU/archname.cbu will get 'called-back' by Configure +# after it has otherwise determined the architecture name. +case "$ldflags" in +*"-flat_namespace"*) ;; # Backward compat, be flat. +# If we are using two-level namespace, we will munge the archname to show it. +*) archname="${archname}-2level" ;; +esac +EOCBU ## # System libraries @@ -117,32 +159,38 @@ usevfork='true'; # malloc works usemymalloc='n'; -## -# Build process -## - # Locales aren't feeling well. LC_ALL=C; export LC_ALL; LANG=C; export LANG; -# Case-insensitive filesystems don't get along with Makefile and -# makefile in the same place. Since Darwin uses GNU make, this dodges -# the problem. -firstmakefile=GNUmakefile; - # # The libraries are not threadsafe as of OS X 10.1. # # Fix when Apple fixes libc. # -case "$usethreads$useithreads$use5005threads" in -*define*) -cat <&4 +case "$usethreads$useithreads" in + *define*) + case "$osvers" in + [12345].*) cat <&4 + + *** Warning, there might be problems with your libraries with *** regards to threading. The test ext/threads/t/libc.t is likely *** to fail. EOM - ;; + ;; + *) usereentrant='define';; + esac + esac + +## +# Build process +## + +# Case-insensitive filesystems don't get along with Makefile and +# makefile in the same place. Since Darwin uses GNU make, this dodges +# the problem. +firstmakefile=GNUmakefile;