diff options
| author | Owain G. Ainsworth <oga@nicotinebsd.org> | 2013-08-22 15:55:02 +0100 |
|---|---|---|
| committer | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2013-08-22 17:09:20 +0100 |
| commit | 2af44768f45c1334e61d39001265268a1e444cb9 (patch) | |
| tree | e719a3b77ad84549d0c8258b46a7e37d915dfcd0 /hints/bitrig.sh | |
| parent | a0a23c6b5c756a6834d9f716c3e819db01408c5a (diff) | |
| download | perl-2af44768f45c1334e61d39001265268a1e444cb9.tar.gz | |
Tweak the perl build some
Fix the cross makefile. makefile.SH treat us like openbsd.
hints/bitrig.sh: remove all version number detection goop. this is for
openbsd versions that are currently *higher* then the bitrig version
number, so avoid foot shooting by throwing it out.
Signed-off-by: Chris 'BinGOs' Williams <chris@bingosnet.co.uk>
Diffstat (limited to 'hints/bitrig.sh')
| -rw-r--r-- | hints/bitrig.sh | 49 |
1 files changed, 2 insertions, 47 deletions
diff --git a/hints/bitrig.sh b/hints/bitrig.sh index 967a7a4e42..5cb55a7d70 100644 --- a/hints/bitrig.sh +++ b/hints/bitrig.sh @@ -14,18 +14,6 @@ test "$usemymalloc" || usemymalloc='n' # Currently, vfork(2) is not a real win over fork(2). usevfork="$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 @@ -36,9 +24,6 @@ esac #ARCH=`arch | sed 's/^OpenBSD.//'` ARCH=`arch | sed 's/^Bitrig.//'` case "${ARCH}-${osvers}" in -alpha-2.[0-8]|mips-2.[0-8]|powerpc-2.[0-7]|m88k-*|hppa-3.[0-5]|vax-*) - test -z "$usedl" && usedl=$undef - ;; *) test -z "$usedl" && usedl=$define # We use -fPIC here because -fpic is *NOT* enough for some of the @@ -59,20 +44,9 @@ alpha-2.[0-8]|mips-2.[0-8]|powerpc-2.[0-7]|m88k-*|hppa-3.[0-5]|vax-*) ;; esac -# -# Tweaks for various versions of OpenBSD -# -case "$osvers" in -2.5) - # OpenBSD 2.5 has broken odbm support - i_dbm=$undef - ;; -esac - # malloc wrap causes problems on m68k if [ X"$usemallocwrap" = X"" ]; then case "${ARCH}" in - m68k) usemallocwrap="$undef" ;; *) usemallocwrap="define" ;; esac fi @@ -87,18 +61,12 @@ d_suidsafe=$define # cc is gcc so we can do better than -O # Allow a command-line override, such as -Doptimize=-g 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 +# This script UU/usethreads.cbu will get 'called-back' by Configure # after it has prompted the user for whether to use threads. cat > UU/usethreads.cbu <<'EOCBU' case "$usethreads" in @@ -106,23 +74,10 @@ $define|true|[yY]*) # any openbsd version dependencies with pthreads? 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-5]) - # Broken up to OpenBSD 3.6, fixed in OpenBSD 3.7 - d_getservbyname_r=$undef ;; - esac esac EOCBU -# This script UU/use64bitint.cbu will get 'called-back' by Configure +# This script UU/use64bitint.cbu will get 'called-back' by Configure # after it has prompted the user for whether to use 64-bitness. cat > UU/use64bitint.cbu <<'EOCBU' case "$use64bitint" in |