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

diff --git a/hints/freebsd.sh b/hints/freebsd.sh
index 8d6a092..937df2a 100644
--- 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,7 +82,10 @@ 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 / /'`
 	d_setregid='define'
 	d_setreuid='define'
@@ -87,7 +93,10 @@ case "$osvers" in
 	d_seteuid='undef'
 	;;
 *)	usevfork='true'
-	usemymalloc='n'
+	case "$usemymalloc" in
+	    "") usemymalloc='n'
+	        ;;
+	esac
 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
 	;;
 esac
@@ -211,10 +220,11 @@ EOM
 	      fi
 	      ldflags="-pthread $ldflags"
 	      case "$osvers" in
-	      4.*)	# 4.x has gethostbyaddr_r but it is
+	      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="undef"
+			d_gethostbyaddr_r_proto="0"
 			;;
 	      esac
 	      ;;
@@ -237,6 +247,11 @@ EOM
         esac
 
         unset lc_r
+
+	# Even with the malloc mutexes the Perl malloc does not
+	# seem to be threadsafe in FreeBSD?
+	usemymalloc=n
+
 esac
 EOCBU