Integrate:

[perl5.git] / hints / freebsd.sh

diff --git a/hints/freebsd.sh b/hints/freebsd.sh
index 41fe55f..7461207 100644 (file)
--- a/hints/freebsd.sh
+++ b/hints/freebsd.sh
@@ -20,7 +20,7 @@
 #
 # Modified to ensure we replace -lc with -lc_r, and
 # to put in place-holders for various specific hints.
-# Andy Dougherty <doughera@lafcol.lafayette.edu>
+# Andy Dougherty <doughera@lafayette.edu>
 # Date: Tue Mar 10 16:07:00 EST 1998
 #
 # Support for FreeBSD/ELF
@@ -67,7 +67,10 @@ case "$osvers" in
 #
 2.0.5*|2.0-built*|2.1*)
        usevfork='true'
-       usemymalloc='n'
+       case "$usemymalloc" in
+           "") usemymalloc='n'
+               ;;
+       esac
        d_setregid='define'
        d_setreuid='define'
        d_setegid='undef'
@@ -79,15 +82,25 @@ case "$osvers" in
 # don't use -lmalloc (maybe there's an old one from 1.1.5.1 floating around)
 2.2*)
        usevfork='true'
-       usemymalloc='n'
+       case "$usemymalloc" in
+           "") usemymalloc='n'
+               ;;
+       esac
        libswanted=`echo $libswanted | sed 's/ malloc / /'`
+       libswanted=`echo $libswanted | sed 's/ bind / /'`
+       # iconv gone in Perl 5.8.1, but if someone compiles 5.8.0 or earlier.
+       libswanted=`echo $libswanted | sed 's/ iconv / /'`
        d_setregid='define'
        d_setreuid='define'
-       d_setegid='undef'
-       d_seteuid='undef'
+       d_setegid='define'
+       d_seteuid='define'
+       # d_dosuid='define' # Obsolete.
        ;;
 *)     usevfork='true'
-       usemymalloc='n'
+       case "$usemymalloc" in
+           "") usemymalloc='n'
+               ;;
+       esac
        libswanted=`echo $libswanted | sed 's/ malloc / /'`
        ;;
 esac
@@ -103,19 +116,19 @@ case "$osvers" in
 
 *)
         objformat=`/usr/bin/objformat`
-        if [ x$objformat = xelf ]; then
-            libpth="/usr/lib /usr/local/lib"
-            glibpth="/usr/lib /usr/local/lib"
-            ldflags="-Wl,-E "
-            lddlflags="-shared "
-        else
+        if [ x$objformat = xaout ]; then
             if [ -e /usr/lib/aout ]; then
                 libpth="/usr/lib/aout /usr/local/lib /usr/lib"
                 glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
             fi
             lddlflags='-Bshareable'
+        else
+            libpth="/usr/lib /usr/local/lib"
+            glibpth="/usr/lib /usr/local/lib"
+            ldflags="-Wl,-E "
+            lddlflags="-shared "
         fi
-        cccdlflags='-DPIC -fpic'
+        cccdlflags='-DPIC -fPIC'
         ;;
 esac
 
@@ -125,11 +138,22 @@ case "$osvers" in
 *)
        ccflags="${ccflags} -DHAS_FPSETMASK -DHAS_FLOATINGPOINT_H"
        if /usr/bin/file -L /usr/lib/libc.so | /usr/bin/grep -vq "not stripped" ; then
-           usenm=false
+           # Respect a command-line override
+           test -z "$usenm" && usenm=false
        fi
         ;;
 esac
 
+
+# If we are using g++ we must use nm and force ourselves to use
+# the /usr/lib/libc.a because the symbol scanning tricks of 
+# Configure will crash and burn horribly.
+case "$cc" in
+*g++*) usenm=true
+       libc='/usr/lib/libc.a'
+       ;;
+esac
+
 cat <<'EOM' >&4
 
 Some users have reported that Configure halts when testing for
@@ -209,14 +233,42 @@ Consider using the latest STABLE release.
 EOM
                 exit 1
              fi
+             # 500016 is the first osreldate in which one could
+             # just link against libc_r without disposing of libc
+             # at the same time.  500016 ... up to whatever it was
+             # on the 31st of August 2003 can still be used with -pthread,
+             # but it is not necessary.
+
+             # Anton Berezin says that post 500something we're wrong to be
+             # to be using -lc_r, and should just be using -pthread on the
+             # linker line.
+             # So presumably really we should be checking that $osver is 5.*)
+             # and that `/sbin/sysctl -n kern.osreldate` -ge 500016
+             # or -lt 500something and only in that range not doing this:
              ldflags="-pthread $ldflags"
+
+             # Both in 4.x and 5.x gethostbyaddr_r exists but
+             # it is "Temporary function, not threadsafe"...
+             # Presumably earlier it didn't even exist.
+             d_gethostbyaddr_r="undef"
+             d_gethostbyaddr_r_proto="0"
              ;;
 
        esac
 
-       set `echo X "$libswanted "| sed -e 's/ c / c_r /'`
-       shift
-       libswanted="$*"
+        case "$osvers" in
+        [1-4]*)
+           set `echo X "$libswanted "| sed -e 's/ c / c_r /'`
+           shift
+           libswanted="$*"
+           ;;
+        *)
+           set `echo X "$libswanted "| sed -e 's/ c //'`
+           shift
+           libswanted="$*"
+           ;;
+       esac
+           
        # Configure will probably pick the wrong libc to use for nm scan.
        # The safest quick-fix is just to not use nm at all...
        usenm=false
@@ -230,6 +282,16 @@ EOM
         esac
 
         unset lc_r
+
+       # Even with the malloc mutexes the Perl malloc does not
+       # seem to be threadsafe in FreeBSD?
+       case "$usemymalloc" in
+       '') usemymalloc=n ;;
+       esac
 esac
 EOCBU
 
+# malloc wrap works
+case "$usemallocwrap" in
+'') usemallocwrap='define' ;;
+esac