Clarify functioning of '||' operator.

[perl5.git] / hints / openbsd.sh

diff --git a/hints/openbsd.sh b/hints/openbsd.sh
index 7e68402..6c366ec 100644 (file)
--- a/hints/openbsd.sh
+++ b/hints/openbsd.sh
@@ -2,7 +2,7 @@
 #
 # hints file for OpenBSD; Todd Miller <millert@openbsd.org>
 # Edited to allow Configure command-line overrides by
-#  Andy Dougherty <doughera@lafcol.lafayette.edu>
+#  Andy Dougherty <doughera@lafayette.edu>
 #
 # To build with distribution paths, use:
 #      ./Configure -des -Dopenbsd_distribution=defined
@@ -11,33 +11,62 @@
 # OpenBSD has a better malloc than perl...
 test "$usemymalloc" || usemymalloc='n'
 
-# Currently, vfork(2) is not a real win over fork(2) but this will
-# change starting with OpenBSD 2.7.
-usevfork='true'
+# malloc wrap works
+case "$usemallocwrap" in
+'') usemallocwrap='define' ;;
+esac
+
+# Currently, vfork(2) is not a real win over fork(2).
+usevfork="$undef"
 
-# setre?[ug]id() have been replaced by the _POSIX_SAVED_IDS versions
-# in 4.4BSD.  Configure will find these but they are just emulated
-# and do not have the same semantics as in 4.3BSD.
-d_setregid=$undef
-d_setreuid=$undef
-d_setrgid=$undef
-d_setruid=$undef
+# In OpenBSD < 3.3, the setre?[ug]id() are emulated using the
+# _POSIX_SAVED_IDS functionality which does not have the same
+# semantics as 4.3BSD.  Starting with OpenBSD 3.3, the original
+# semantics have been restored.
+case "$osvers" in
+[0-2].*|3.[0-2])
+       d_setregid=$undef
+       d_setreuid=$undef
+       d_setrgid=$undef
+       d_setruid=$undef
+esac
 
 #
 # Not all platforms support dynamic loading...
+# For the case of "$openbsd_distribution", the hints file
+# needs to know whether we are using dynamic loading so that
+# it can set the libperl name appropriately.
+# Allow command line overrides.
 #
-case `arch` in
-OpenBSD.alpha|OpenBSD.mips|OpenBSD.powerpc|OpenBSD.vax)
-       usedl=$undef
+ARCH=`arch | sed 's/^OpenBSD.//'`
+case "${ARCH}-${osvers}" in
+alpha-2.[0-8]|mips-2.[0-8]|powerpc-2.[0-7]|m88k-[2-4].*|m88k-5.[0-2]|hppa-3.[0-5]|vax-*)
+       test -z "$usedl" && usedl=$undef
        ;;
 *)
-       usedl=$define
-       d_dlopen=$define
-       d_dlerror=$define
-       # we use -fPIC here because -fpic is *NOT* enough for some of the
+       test -z "$usedl" && usedl=$define
+       # We use -fPIC here because -fpic is *NOT* enough for some of the
        # extensions like Tk on some OpenBSD platforms (ie: sparc)
        cccdlflags="-DPIC -fPIC $cccdlflags"
-       lddlflags="-Bshareable $lddlflags"
+       case "$osvers" in
+       [01].*|2.[0-7]|2.[0-7].*)
+               lddlflags="-Bshareable $lddlflags"
+               ;;
+       2.[8-9]|3.0)
+               ld=${cc:-cc}
+               lddlflags="-shared -fPIC $lddlflags"
+               ;;
+       *) # from 3.1 onwards
+               ld=${cc:-cc}
+               lddlflags="-shared -fPIC $lddlflags"
+               libswanted=`echo $libswanted | sed 's/ dl / /'`
+               ;;
+       esac
+
+       # We need to force ld to export symbols on ELF platforms.
+       # Without this, dlopen() is crippled.
+       ELF=`${cc:-cc} -dM -E - </dev/null | grep __ELF__`
+       test -n "$ELF" && ldflags="-Wl,-E $ldflags"
        ;;
 esac
 
@@ -60,7 +89,17 @@ d_suidsafe=$define
 
 # cc is gcc so we can do better than -O
 # Allow a command-line override, such as -Doptimize=-g
-test "$optimize" || optimize='-O2'
+case "${ARCH}-${osvers}" in
+hppa-3.3|m88k-2.*|m88k-3.[0-3])
+   test "$optimize" || optimize='-O0'
+   ;;
+m88k-3.4)
+   test "$optimize" || optimize='-O1'
+   ;;
+*)
+   test "$optimize" || optimize='-O2'
+   ;;
+esac
 
 # This script UU/usethreads.cbu will get 'called-back' by Configure 
 # after it has prompted the user for whether to use threads.
@@ -68,7 +107,21 @@ cat > UU/usethreads.cbu <<'EOCBU'
 case "$usethreads" in
 $define|true|[yY]*)
        # any openbsd version dependencies with pthreads?
-       libswanted="$libswanted pthread"
+       ccflags="-pthread $ccflags"
+       ldflags="-pthread $ldflags"
+       case "$osvers" in
+       [0-2].*|3.[0-2])
+               # Change from -lc to -lc_r
+               set `echo "X $libswanted " | sed 's/ c / c_r /'`
+               shift
+               libswanted="$*"
+       ;;
+       esac
+       case "$osvers" in
+       [012].*|3.[0-6])
+               # Broken up to OpenBSD 3.6, fixed in OpenBSD 3.7
+               d_getservbyname_r=$undef ;;
+       esac
 esac
 EOCBU
 
@@ -83,6 +136,9 @@ case "$openbsd_distribution" in
        sysman='/usr/share/man/man1'
        libpth='/usr/lib'
        glibpth='/usr/lib'
+       # Local things, however, do go in /usr/local
+       siteprefix='/usr/local'
+       siteprefixexp='/usr/local'
        # Ports installs non-std libs in /usr/local/lib so look there too
        locincpth='/usr/local/include'
        loclibpth='/usr/local/lib'