FreeBSD: if someone *really* wants to use the system malloc.

[p5sagit/p5-mst-13.2.git] / hints / freebsd.sh

diff --git a/hints/freebsd.sh b/hints/freebsd.sh
index 8b324da..479fa2b 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,34 @@ 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'
        d_setegid='undef'
        d_seteuid='undef'
        ;;
+4.*)   # In FreeBSD 4 and 5 the system malloc is performance-wise
+       # VERY bad for Perl-- we are talking of differences of not
+       # one, but TWO magnitudes.
+       case "$usemymalloc" in
+       "") usemymalloc='y'
+           ;;
+       esac
+       ;;
+5.*)   case "$usemymalloc" in
+       "") usemymalloc='y'
+           ;;
+       esac
+       ;;
 *)     usevfork='true'
-       usemymalloc='n'
+       case "$usemymalloc" in
+       "") usemymalloc='y'
+           ;;
+       esac
        libswanted=`echo $libswanted | sed 's/ malloc / /'`
        ;;
 esac
@@ -210,7 +232,14 @@ EOM
                 exit 1
              fi
              ldflags="-pthread $ldflags"
-             ccflags="-D_THREAD_SAFE $ccflags"
+             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
@@ -231,6 +260,11 @@ EOM
         esac
 
         unset lc_r
+
+       # Even with the malloc mutexes the Perl malloc does not
+       # seem to be threadsafe in FreeBSD?
+       usemymalloc=y
+
 esac
 EOCBU