at master 8.0 kB view raw
1diff --git a/Configure b/Configure 2index 4da7088bff..1a86e0a77d 100755 3--- a/Configure 4+++ b/Configure 5@@ -108,15 +108,7 @@ if test -d c:/. || ( uname -a | grep -i 'os\(/\|\)2' 2>&1 ) 2>&1 >/dev/null ; th 6 fi 7 8 : Proper PATH setting 9-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' 10-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" 11-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" 12-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" 13-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" 14-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" 15-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" 16-paths="$paths /sbin /usr/sbin /usr/libexec" 17-paths="$paths /system/gnu_library/bin" 18+paths='' 19 20 for p in $paths 21 do 22@@ -1459,8 +1451,7 @@ groupstype='' 23 i_whoami='' 24 : Possible local include directories to search. 25 : Set locincpth to "" in a hint file to defeat local include searches. 26-locincpth="/usr/local/include /opt/local/include /usr/gnu/include" 27-locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" 28+locincpth="" 29 : 30 : no include file wanted by default 31 inclwanted='' 32@@ -1474,19 +1465,12 @@ DEBUGGING='' 33 archobjs='' 34 libnames='' 35 : change the next line if compiling for Xenix/286 on Xenix/386 36-xlibpth='/usr/lib/386 /lib/386' 37+xlibpth='' 38 : Possible local library directories to search. 39-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" 40-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" 41+loclibpth="" 42 43 : general looking path for locating libraries 44-glibpth="/lib /usr/lib $xlibpth" 45-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" 46-test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" 47-test -f /shlib/libc.so && glibpth="/shlib $glibpth" 48-test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" 49- 50-: Private path used by Configure to find libraries. Its value 51+glibpth="" 52 : is prepended to libpth. This variable takes care of special 53 : machines, like the mips. Usually, it should be empty. 54 plibpth='' 55@@ -1519,8 +1503,6 @@ libswanted="cl pthread socket bind inet ndbm gdbm dbm db malloc dl ld" 56 libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD" 57 : We probably want to search /usr/shlib before most other libraries. 58 : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. 59-glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` 60-glibpth="/usr/shlib $glibpth" 61 : Do not use vfork unless overridden by a hint file. 62 usevfork=false 63 64@@ -2585,7 +2567,6 @@ uname 65 zip 66 " 67 pth=`echo $PATH | sed -e "s/$p_/ /g"` 68-pth="$pth $sysroot/lib $sysroot/usr/lib" 69 for file in $loclist; do 70 eval xxx=\$$file 71 case "$xxx" in 72@@ -5032,7 +5013,7 @@ esac 73 : Set private lib path 74 case "$plibpth" in 75 '') if ./mips; then 76- plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib" 77+ plibpth="$incpath/usr/lib" 78 fi;; 79 esac 80 case "$libpth" in 81@@ -8869,13 +8850,8 @@ esac 82 echo " " 83 case "$sysman" in 84 '') 85- syspath='/usr/share/man/man1 /usr/man/man1' 86- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" 87- syspath="$syspath /usr/man/u_man/man1" 88- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" 89- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" 90- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" 91- sysman=`./loc . /usr/man/man1 $syspath` 92+ syspath='' 93+ sysman='' 94 ;; 95 esac 96 if $test -d "$sysman"; then 97@@ -21740,9 +21716,10 @@ $rm_try tryp 98 case "$full_ar" in 99 '') full_ar=$ar ;; 100 esac 101+full_ar=ar 102 103 : Store the full pathname to the sed program for use in the C program 104-full_sed=$sed 105+full_sed=sed 106 107 : see what type gids are declared as in the kernel 108 echo " " 109diff --git a/hints/freebsd.sh b/hints/freebsd.sh 110index 70bb90ee95..6580219c17 100644 111--- a/hints/freebsd.sh 112+++ b/hints/freebsd.sh 113@@ -127,21 +127,21 @@ case "$osvers" in 114 objformat=`/usr/bin/objformat` 115 if [ x$objformat = xaout ]; then 116 if [ -e /usr/lib/aout ]; then 117- libpth="/usr/lib/aout /usr/local/lib /usr/lib" 118- glibpth="/usr/lib/aout /usr/local/lib /usr/lib" 119+ libpth="" 120+ glibpth="" 121 fi 122 lddlflags='-Bshareable' 123 else 124- libpth="/usr/lib /usr/local/lib" 125- glibpth="/usr/lib /usr/local/lib" 126+ libpth="" 127+ glibpth="" 128 ldflags="-Wl,-E " 129 lddlflags="-shared " 130 fi 131 cccdlflags='-DPIC -fPIC' 132 ;; 133 *) 134- libpth="/usr/lib /usr/local/lib" 135- glibpth="/usr/lib /usr/local/lib" 136+ libpth="" 137+ glibpth="" 138 ldflags="-Wl,-E " 139 lddlflags="-shared " 140 cccdlflags='-DPIC -fPIC' 141diff --git a/hints/linux.sh b/hints/linux.sh 142index 83ba0c5c97..d7b6ce04fe 100644 143--- a/hints/linux.sh 144+++ b/hints/linux.sh 145@@ -176,27 +176,6 @@ case "$optimize" in 146 ;; 147 esac 148 149-# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries 150-# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us 151-# where to look. We don't want gcc's own libraries, however, so we 152-# filter those out. 153-# This could be conditional on Ubuntu, but other distributions may 154-# follow suit, and this scheme seems to work even on rather old gcc's. 155-# This unconditionally uses gcc because even if the user is using another 156-# compiler, we still need to find the math library and friends, and I don't 157-# know how other compilers will cope with that situation. 158-# Morever, if the user has their own gcc earlier in $PATH than the system gcc, 159-# we don't want its libraries. So we try to prefer the system gcc 160-# Still, as an escape hatch, allow Configure command line overrides to 161-# plibpth to bypass this check. 162-if [ -x /usr/bin/gcc ] ; then 163- gcc=/usr/bin/gcc 164-# clang also provides -print-search-dirs 165-elif ${cc:-cc} --version 2>/dev/null | grep -q -e '^clang version' -e ' clang version'; then 166- gcc=${cc:-cc} 167-else 168- gcc=gcc 169-fi 170 171 case "$plibpth" in 172 '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries | 173@@ -234,31 +213,6 @@ case "$usequadmath" in 174 ;; 175 esac 176 177-case "$libc" in 178-'') 179-# If you have glibc, then report the version for ./myconfig bug reporting. 180-# (Configure doesn't need to know the specific version since it just uses 181-# gcc to load the library for all tests.) 182-# We don't use __GLIBC__ and __GLIBC_MINOR__ because they 183-# are insufficiently precise to distinguish things like 184-# libc-2.0.6 and libc-2.0.7. 185- for p in $plibpth 186- do 187- for trylib in libc.so.6 libc.so 188- do 189- if $test -e $p/$trylib; then 190- libc=`ls -l $p/$trylib | awk '{print $NF}'` 191- if $test "X$libc" != X; then 192- break 193- fi 194- fi 195- done 196- if $test "X$libc" != X; then 197- break 198- fi 199- done 200- ;; 201-esac 202 203 if ${sh:-/bin/sh} -c exit; then 204 echo '' 205@@ -337,32 +291,6 @@ sparc*) 206 ;; 207 esac 208 209-# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than 210-# true libraries. The scripts cause binding against static 211-# version of -lgdbm which is a bad idea. So if we have 'nm' 212-# make sure it can read the file 213-# NI-S 2003/08/07 214-case "$nm" in 215- '') ;; 216- *) 217- for p in $plibpth 218- do 219- if $test -r $p/libndbm.so; then 220- if $nm $p/libndbm.so >/dev/null 2>&1 ; then 221- echo 'Your shared -lndbm seems to be a real library.' 222- _libndbm_real=1 223- break 224- fi 225- fi 226- done 227- if $test "X$_libndbm_real" = X; then 228- echo 'Your shared -lndbm is not a real library.' 229- set `echo X "$libswanted "| sed -e 's/ ndbm / /'` 230- shift 231- libswanted="$*" 232- fi 233- ;; 234-esac 235 236 # Linux on Synology. 237 if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then