X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Ffreebsd.sh;h=7d543be0457901781cdde1b115fa02154a0c8496;hb=e75f8ea9991e059e875b1407c34a259205f0a505;hp=937df2a85a0069f28ee33b7cf8da4c5ba038209d;hpb=c6e7ee5baf1b7ad0b2d86890e4174d74a2709b05;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/freebsd.sh b/hints/freebsd.sh
index 937df2a..7d543be 100644
--- a/hints/freebsd.sh
+++ b/hints/freebsd.sh
@@ -87,10 +87,14 @@ case "$osvers" in
 	        ;;
 	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'
 	case "$usemymalloc" in
@@ -112,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
 
@@ -207,7 +211,7 @@ EOM
 	      exit 1
 	      ;;
 
-	*)
+	[3-5].*)
 	      if [ ! -r "$lc_r" ]; then
 	      cat <<EOM >&4
 POSIX threads should be supported by FreeBSD $osvers --
@@ -218,22 +222,50 @@ 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"
+	      ;;
+
+	*)
+	      # 7.x doesn't install libc_r by default, and Configure
+	      # would fail in the code following
+	      #
+	      # gethostbyaddr_r() appears to have been implemented in 6.x+
 	      ldflags="-pthread $ldflags"
-	      case "$osvers" in
-	      4.*|5.0-release*)	
-			# 4.x and 5.0-release have gethostbyaddr_r but it is
-			# "Temporary function, not threadsafe"...
-			d_gethostbyaddr_r="undef"
-			d_gethostbyaddr_r_proto="0"
-			;;
-	      esac
 	      ;;
 
 	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
@@ -250,8 +282,22 @@ EOM
 
 	# Even with the malloc mutexes the Perl malloc does not
 	# seem to be threadsafe in FreeBSD?
-	usemymalloc=n
-
+	case "$usemymalloc" in
+	'') usemymalloc=n ;;
+	esac
 esac
 EOCBU
 
+# malloc wrap works
+case "$usemallocwrap" in
+'') usemallocwrap='define' ;;
+esac
+
+# XXX Under FreeBSD 6.0 (and probably most other similar versions)
+# Perl_die(NULL) generates a warning:
+#    pp_sys.c:491: warning: null format string
+# Configure supposedely tests for this, but apparently the test doesn't
+# work.  Volunteers with FreeBSD are needed to improving the Configure test.
+# Meanwhile, the following workaround should be safe on all versions
+# of FreeBSD.
+d_printf_format_null='undef'