X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Ffreebsd.sh;h=4d2ba22b10ad7f8451ac63200fd2a8d640cb4ed2;hb=3f4fc4634a226330cf98eab6871f26f45d52e425;hp=74bae055bf945553151387cbdc5e5a3edb2606f2;hpb=c296029969658ed2c8d9a223d4b09026463ca970;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/freebsd.sh b/hints/freebsd.sh
index 74bae05..4d2ba22 100644
--- a/hints/freebsd.sh
+++ b/hints/freebsd.sh
@@ -14,9 +14,10 @@
 # Ollivier Robert <Ollivier.Robert@keltia.frmug.fr.net>
 # Date: Fri, 12 May 1995 14:30:38 +0200 (MET DST)
 #
-# FreeBSD has the dynamic loading dl*() functions in /usr/lib/crt0.o,
-# so Configure doesn't find them (unless you abandon the nm scan).
-#
+# Additional 2.2 defines from
+# Mark Murray <mark@grondar.za>
+# Date: Wed, 6 Nov 1996 09:44:58 +0200 (MET)
+# 
 # The two flags "-fpic -DPIC" are used to indicate a
 # will-be-shared object.  Configure will guess the -fpic, (and the
 # -DPIC is not used by perl proper) but the full define is included to 
@@ -31,9 +32,7 @@ case "$osvers" in
 0.*|1.0*)
 	usedl="$undef"
 	;;
-1.1*)	d_dlopen="$define"
-	cccdlflags='-DPIC -fpic'
-	lddlflags="-Bshareable $lddlflags"
+1.1*)
 	malloctype='void *'
 	groupstype='int'
 	d_setregid='undef'
@@ -41,31 +40,70 @@ case "$osvers" in
 	d_setrgid='undef'
 	d_setruid='undef'
 	;;
-2.0-RELEASE*)
-	d_dlopen="$define"
-	cccdlflags='-DPIC -fpic'
-	lddlflags="-Bshareable $lddlflags"
+2.0-release*)
 	d_setregid='undef'
 	d_setreuid='undef'
 	d_setrgid='undef'
 	d_setruid='undef'
 	;;
 #
-# Trying to cover 2.0.5, 2.1-current and future 2.1
+# Trying to cover 2.0.5, 2.1-current and future 2.1/2.2
 # It does not covert all 2.1-current versions as the output of uname
 # changed a few times.
 #
-2.0.5*|2.0-BUILD|2.1*)
-	d_dlopen="$define"
-	cccdlflags='-DPIC -fpic'
-	lddlflags="-Bshareable $lddlflags"
-	# Are these defines necessary?  Doesn't Configure find them
-	# correctly?
+# Even though seteuid/setegid are available, they've been turned off
+# because perl isn't coded with saved set[ug]id variables in mind.
+# In addition, a small patch is requried to suidperl to avoid a security
+# problem with FreeBSD.
+#
+2.0.5*|2.0-built*|2.1*)
+ 	usevfork='true'
+	usemymalloc='n'
+	d_dosuid='define'
 	d_setregid='define'
 	d_setreuid='define'
-	d_setrgid='define'
-	d_setruid='define'
+	d_setegid='undef'
+	d_seteuid='undef'
+	test -r ./broken-db.msg && . ./broken-db.msg
+	;;
+#
+# 2.2 and above have phkmalloc(3).
+2.2*)
+ 	usevfork='true'
+	usemymalloc='n'
+	d_dosuid='define'
+	d_setregid='define'
+	d_setreuid='define'
+	d_setegid='undef'
+	d_seteuid='undef'
+	;;
+#
+# Guesses at what will be needed after 2.2
+*)	usevfork='true'
+	usemymalloc='n'
+	;;
+esac
+
+# Dynamic Loading flags have not changed much, so they are separated
+# out here to avoid duplicating them everywhere.
+case "$osvers" in
+0.*|1.0*) ;;
+*)	cccdlflags='-DPIC -fpic'
+	lddlflags="-Bshareable $lddlflags"
+	;;
 esac
+
 # Avoid telldir prototype conflict in pp_sys.c  (FreeBSD uses const DIR *)
 # Configure should test for this.  Volunteers?
 pp_sys_cflags='ccflags="$ccflags -DHAS_TELLDIR_PROTOTYPE"'
+
+cat <<'EOM'
+
+Some users have reported that Configure halts when testing for
+the O_NONBLOCK symbol with a syntax error.  This is apparently a
+sh error.  Rerunning Configure with ksh apparently fixes the
+problem.  Try
+	ksh Configure [your options]
+
+EOM
+