X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fsolaris_2.sh;h=8f0c3e6fbba8e09195003359f608410fcfb1cba7;hb=2bab0636fd7890b7f252b039f74b158a58919c44;hp=ce36480b1818d36719830fff24a26f8aac23230c;hpb=59bcd2675b4d9d9def0f3ce528f98c2f096c4bfc;p=p5sagit%2Fp5-mst-13.2.git diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh index ce36480..8f0c3e6 100644 --- a/hints/solaris_2.sh +++ b/hints/solaris_2.sh @@ -42,6 +42,17 @@ esac set `echo $glibpth | sed -e 's@/usr/ucblib@@' -e 's@ /lib @ @'` glibpth="$*" +# Starting with Solaris 10, we don't want versioned shared libraries because +# those often indicate a private use only library. Especially badly that would +# break things with SUNWbdb (Berkeley DB) being installed, which brings in +# /usr/lib/libdb.so.1, but that is not really meant for public consumption. +# XXX Revisit after perl 5.10 -- should we apply this to older Solaris +# versions too? (A.D. 11/2007). +case "`uname -r`" in +5.[0-9]) ;; +*) ignore_versioned_solibs=y ;; +esac + # Remove unwanted libraries. -lucb contains incompatible routines. # -lld and -lsec don't do anything useful. -lcrypt does not # really provide anything we need over -lc, so we drop it, too. @@ -56,11 +67,11 @@ libswanted="$*" case "$archname" in '') if test -f /usr/bin/arch; then - archname=`/usr/bin/arch` - archname="${archname}-${osname}" + archname=`/usr/bin/arch` + archname="${archname}-${osname}" elif test -f /usr/ucb/arch; then - archname=`/usr/ucb/arch` - archname="${archname}-${osname}" + archname=`/usr/ucb/arch` + archname="${archname}-${osname}" fi ;; esac @@ -81,7 +92,7 @@ END case "$cc" in '') if test -f /opt/SUNWspro/bin/cc; then cc=/opt/SUNWspro/bin/cc - cat <&4 + cat <&4 You specified no cc but you seem to have the Workshop compiler ($cc) installed, using that. @@ -153,7 +164,7 @@ esac # The path name is the last field in the output, but the type command # has an annoying array of possible outputs, e.g.: # make is hashed (/opt/gnu/bin/make) -# cc is /usr/ucb/cc +# cc is /usr/ucb/cc # foo not found # use a command like type make | awk '{print $NF}' | sed 's/[()]//g' @@ -197,7 +208,7 @@ cat > UU/cc.cbu <<'EOCBU' # be able to perform dynamic loading of extensions. If you have a # problem with dynamic loading, be sure that you are using the Solaris # /usr/ccs/bin/as and /usr/ccs/bin/ld. You can do that with -# sh Configure -Dcc='gcc -B/usr/ccs/bin/' +# sh Configure -Dcc='gcc -B/usr/ccs/bin/' # (note the trailing slash is required). # Combinations that are known to work with the following hints: # @@ -211,7 +222,10 @@ echo 'int main() { return 0; }' > try.c # Indent to avoid propagation to config.sh verbose=`${cc:-cc} -v -o try try.c 2>&1` -if echo "$verbose" | grep '^Reading specs from' >/dev/null 2>&1; then +# XXX TODO: 'specs' output changed from 'Reading specs from' in gcc-[23] to 'Using +# built-in specs' in gcc-4. Perhaps we should just use the same gcc test as +# in Configure to see if we're using gcc. +if echo "$verbose" | egrep '(Reading specs from)|(Using built-in specs)' >/dev/null 2>&1; then # # Using gcc. # @@ -257,14 +271,14 @@ END # (This may all depend on local configurations too.) # Recompute verbose with -Wl,-v to find GNU ld if present - verbose=`${cc:-cc} -v -Wl,-v -o try try.c 2>&1 | grep ld 2>&1` + verbose=`${cc:-cc} -Wl,-v -o try try.c 2>&1 | grep /ld 2>&1` - myld=`echo $verbose| grep ld | awk '/\/ld/ {print $1}'` + myld=`echo $verbose | awk '/\/ld/ {print $1}'` # This assumes that gcc's output will not change, and that # /full/path/to/ld will be the first word of the output. # Thus myld is something like /opt/gnu/sparc-sun-solaris2.5/bin/ld - # Allow that $myld may be '', due to changes in gcc's output + # Allow that $myld may be '', due to changes in gcc's output if ${myld:-ld} -V 2>&1 | grep "ld: Software Generation Utilities" >/dev/null 2>&1; then # Ok, /usr/ccs/bin/ld eventually does get called. @@ -356,12 +370,12 @@ cat > UU/usethreads.cbu <<'EOCBU' # after it has prompted the user for whether to use threads. case "$usethreads" in $define|true|[yY]*) - ccflags="-D_REENTRANT $ccflags" + ccflags="-D_REENTRANT $ccflags" # -lpthread overrides some lib C functions, so put it before c. - set `echo X "$libswanted "| sed -e "s/ c / pthread c /"` - shift - libswanted="$*" + set `echo X "$libswanted "| sed -e "s/ c / pthread c /"` + shift + libswanted="$*" # sched_yield is available in the -lrt library. However, # we can also pick up the equivalent yield() function in the @@ -377,14 +391,14 @@ $define|true|[yY]*) libswanted="$*" fi - # On Solaris 2.6 x86 there is a bug with sigsetjmp() and siglongjmp() - # when linked with the threads library, such that whatever positive - # value you pass to siglongjmp(), sigsetjmp() returns 1. - # Thanks to Simon Parsons for this report. - # Sun BugID is 4117946, "sigsetjmp always returns 1 when called by - # siglongjmp in a MT program". As of 19980622, there is no patch - # available. - cat >try.c <<'EOM' + # On Solaris 2.6 x86 there is a bug with sigsetjmp() and siglongjmp() + # when linked with the threads library, such that whatever positive + # value you pass to siglongjmp(), sigsetjmp() returns 1. + # Thanks to Simon Parsons for this report. + # Sun BugID is 4117946, "sigsetjmp always returns 1 when called by + # siglongjmp in a MT program". As of 19980622, there is no patch + # available. + cat >try.c <<'EOM' /* Test for sig(set|long)jmp bug. */ #include @@ -398,17 +412,10 @@ $define|true|[yY]*) siglongjmp(env, 2); } EOM - if test "`arch`" = i86pc -a `uname -r` = 5.6 && \ - ${cc:-cc} try.c -lpthread >/dev/null 2>&1 && ./a.out; then - d_sigsetjmp=$undef - cat << 'EOM' >&2 - -You will see a *** WHOA THERE!!! *** message from Configure for -d_sigsetjmp. Keep the recommended value. See hints/solaris_2.sh -for more information. - -EOM - fi + if test "`arch`" = i86pc -a `uname -r` = 5.6 && \ + ${cc:-cc} try.c -lpthread >/dev/null 2>&1 && ./a.out; then + d_sigsetjmp=$undef + fi # These prototypes should be visible since we using # -D_REENTRANT, but that does not seem to work. @@ -443,7 +450,7 @@ case "$uselargefiles" in # Keep these in the left margin. ccflags_uselargefiles="`getconf LFS_CFLAGS 2>/dev/null`" ldflags_uselargefiles="`getconf LFS_LDFLAGS 2>/dev/null`" -libswanted_uselargefiles="`getconf LFS_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g`" +libswanted_uselargefiles="`getconf LFS_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g'`" ccflags="$ccflags $ccflags_uselargefiles" ldflags="$ldflags $ldflags_uselargefiles" @@ -460,7 +467,15 @@ case "$usemorebits" in ;; esac -if test `uname -p` = "sparc"; then +if test `uname -p` = i386; then + case "$use64bitint" in + "$define"|true|[yY]*) + ccflags="$ccflags -DPTR_IS_LONG" + ;; + esac +fi + +if test `uname -p` = sparc -o `uname -p` = i386; then cat > UU/use64bitint.cbu <<'EOCBU' # This script UU/use64bitint.cbu will get 'called-back' by Configure # after it has prompted the user for whether to use 64 bit integers. @@ -478,7 +493,7 @@ EOM # gcc-2.8.1 on Solaris 8 with -Duse64bitint fails op/pat.t test 822 # if we compile regexec.c with -O. Turn off optimization for that one -# file. See hints/README.hints , especially +# file. See hints/README.hints , especially # =head2 Propagating variables to config.sh, method 3. # A. Dougherty May 24, 2002 case "${gccversion}-${optimize}" in @@ -487,7 +502,7 @@ EOM case "$regexec_cflags" in '') echo "Disabling optimization on regexec.c for gcc $gccversion" >&4 regexec_cflags='optimize=' - echo "regexec_cflags='optimize=\"\"'" >> config.sh + echo "regexec_cflags='optimize=\"\"'" >> config.sh ;; esac ;; @@ -510,15 +525,18 @@ EOM exit 1 ;; esac - libc='/usr/lib/sparcv9/libc.so' - if test ! -f $libc; then - cat >&4 <&4 </dev/null" in *gcc*) @@ -537,14 +555,18 @@ EOM exit 1 ;; esac - loclibpth="/usr/lib/sparcv9 $loclibpth" - ccflags="$ccflags -mcpu=v9 -m64" - if test X`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null` != X; then - # This adds in -Wa,-xarch=v9. I suspect that's superfluous, - # since the -m64 above should do that already. Someone - # with gcc-3.x.x, please test with gcc -v. A.D. 20-Nov-2003 - ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" + if test "$processor" = sparc; then + loclibpth="/usr/lib/sparcv9 $loclibpth" + ccflags="$ccflags -mcpu=v9" fi + ccflags="$ccflags -m64" + + # This adds in -Wa,-xarch=v9. I suspect that's superfluous, + # since the -m64 above should do that already. Someone + # with gcc-3.x.x, please test with gcc -v. A.D. 20-Nov-2003 +# if test $processor = sparc -a X`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null` != X; then +# ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" +# fi ldflags="$ldflags -m64" lddlflags="$lddlflags -G -m64" ;; @@ -554,10 +576,13 @@ EOM lddlflags="$lddlflags -G `getconf XBS5_LP64_OFF64_LDFLAGS 2>/dev/null`" echo "int main() { return(0); } " > try.c tryworkshopcc="${cc:-cc} try.c -o try $ccflags" - loclibpth="/usr/lib/sparcv9 /usr/ccs/lib/sparcv9 `$getworkshoplibs` $loclibpth" + if test "$processor" = sparc; then + loclibpth="/usr/lib/sparcv9 /usr/ccs/lib/sparcv9 $loclibpth" + fi + loclibpth="`$getworkshoplibs` $loclibpth" ;; esac - + unset processor use64bitall_done=yes archname64=64 ;; @@ -600,4 +625,33 @@ EOM esac EOCBU +# +# If unsetenv is available, use it in conjunction with PERL_USE_SAFE_PUTENV to +# work around Sun bugid 6333830. Both unsetenv and 6333830 only appear in +# Solaris 10, so we don't need to probe explicitly for an OS version. We have +# to append this test to the end of config.over as it needs to run after +# Configure has probed for unsetenv, and this hints file is processed before +# that has happened. +# +cat >> config.over <<'EOOVER' +if test "$d_unsetenv" = "$define" -a \ + `expr "$ccflags" : '.*-D_PERL_USE_SAFE_PUTENV'` -eq 0; then + ccflags="$ccflags -DPERL_USE_SAFE_PUTENV" +fi +EOOVER + rm -f try.c try.o try a.out + +# If using C++, the Configure scan for dlopen() will fail in Solaris +# because one of the two (1) an extern "C" linkage definition is needed +# (2) #include is needed, *and* a cast to (void*(*)()) +# is needed for the &dlopen. Adding any of these would require changing +# a delicate spot in Configure, so easier just to force our guess here +# for Solaris. Much the same goes for dlerror(). +case "$cc" in +*g++*|*CC*) + d_dlopen='define' + d_dlerror='define' + ;; +esac +