at 18.09-beta 250 lines 8.7 kB view raw
1diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure 2--- perl-5.20.0-orig/Configure 2014-05-26 15:34:18.000000000 +0200 3+++ perl-5.20.0/Configure 2014-06-25 10:43:35.368285986 +0200 4@@ -106,15 +106,7 @@ 5 fi 6 7 : Proper PATH setting 8-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' 9-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" 10-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" 11-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" 12-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" 13-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" 14-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" 15-paths="$paths /sbin /usr/sbin /usr/libexec" 16-paths="$paths /system/gnu_library/bin" 17+paths='' 18 19 for p in $paths 20 do 21@@ -1337,8 +1329,7 @@ 22 archname='' 23 : Possible local include directories to search. 24 : Set locincpth to "" in a hint file to defeat local include searches. 25-locincpth="/usr/local/include /opt/local/include /usr/gnu/include" 26-locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" 27+locincpth="" 28 : 29 : no include file wanted by default 30 inclwanted='' 31@@ -1349,17 +1340,12 @@ 32 33 libnames='' 34 : change the next line if compiling for Xenix/286 on Xenix/386 35-xlibpth='/usr/lib/386 /lib/386' 36+xlibpth='' 37 : Possible local library directories to search. 38-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" 39-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" 40+loclibpth="" 41 42 : general looking path for locating libraries 43-glibpth="/lib /usr/lib $xlibpth" 44-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" 45-test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" 46-test -f /shlib/libc.so && glibpth="/shlib $glibpth" 47-test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" 48+glibpth="" 49 50 : Private path used by Configure to find libraries. Its value 51 : is prepended to libpth. This variable takes care of special 52@@ -1391,8 +1377,6 @@ 53 libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" 54 : We probably want to search /usr/shlib before most other libraries. 55 : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. 56-glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` 57-glibpth="/usr/shlib $glibpth" 58 : Do not use vfork unless overridden by a hint file. 59 usevfork=false 60 61@@ -2446,7 +2430,6 @@ 62 zip 63 " 64 pth=`echo $PATH | sed -e "s/$p_/ /g"` 65-pth="$pth $sysroot/lib $sysroot/usr/lib" 66 for file in $loclist; do 67 eval xxx=\$$file 68 case "$xxx" in 69@@ -4936,7 +4919,7 @@ 70 : Set private lib path 71 case "$plibpth" in 72 '') if ./mips; then 73- plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib" 74+ plibpth="$incpath/usr/lib" 75 fi;; 76 esac 77 case "$libpth" in 78@@ -8600,13 +8583,8 @@ 79 echo " " 80 case "$sysman" in 81 '') 82- syspath='/usr/share/man/man1 /usr/man/man1' 83- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" 84- syspath="$syspath /usr/man/u_man/man1" 85- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" 86- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" 87- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" 88- sysman=`./loc . /usr/man/man1 $syspath` 89+ syspath='' 90+ sysman='' 91 ;; 92 esac 93 if $test -d "$sysman"; then 94@@ -19900,9 +19878,10 @@ 95 case "$full_ar" in 96 '') full_ar=$ar ;; 97 esac 98+full_ar=ar 99 100 : Store the full pathname to the sed program for use in the C program 101-full_sed=$sed 102+full_sed=sed 103 104 : see what type gids are declared as in the kernel 105 echo " " 106Only in perl-5.20.0/: Configure.orig 107diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL 108--- perl-5.20.0-orig/ext/Errno/Errno_pm.PL 2014-05-26 15:34:20.000000000 +0200 109+++ perl-5.20.0/ext/Errno/Errno_pm.PL 2014-06-25 10:31:24.317970047 +0200 110@@ -126,11 +126,7 @@ 111 if ($dep =~ /(\S+errno\.h)/) { 112 $file{$1} = 1; 113 } 114- } elsif ($^O eq 'linux' && 115- $Config{gccversion} ne '' && 116- $Config{gccversion} !~ /intel/i 117- # might be using, say, Intel's icc 118- ) { 119+ } elsif (0) { 120 # When cross-compiling we may store a path for gcc's "sysroot" option: 121 my $sysroot = $Config{sysroot} || ''; 122 # Some Linuxes have weird errno.hs which generate 123Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig 124diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh 125--- perl-5.20.0-orig/hints/freebsd.sh 2014-01-31 22:55:51.000000000 +0100 126+++ perl-5.20.0/hints/freebsd.sh 2014-06-25 10:25:53.263964680 +0200 127@@ -119,21 +119,21 @@ 128 objformat=`/usr/bin/objformat` 129 if [ x$objformat = xaout ]; then 130 if [ -e /usr/lib/aout ]; then 131- libpth="/usr/lib/aout /usr/local/lib /usr/lib" 132- glibpth="/usr/lib/aout /usr/local/lib /usr/lib" 133+ libpth="" 134+ glibpth="" 135 fi 136 lddlflags='-Bshareable' 137 else 138- libpth="/usr/lib /usr/local/lib" 139- glibpth="/usr/lib /usr/local/lib" 140+ libpth="" 141+ glibpth="" 142 ldflags="-Wl,-E " 143 lddlflags="-shared " 144 fi 145 cccdlflags='-DPIC -fPIC' 146 ;; 147 *) 148- libpth="/usr/lib /usr/local/lib" 149- glibpth="/usr/lib /usr/local/lib" 150+ libpth="" 151+ glibpth="" 152 ldflags="-Wl,-E " 153 lddlflags="-shared " 154 cccdlflags='-DPIC -fPIC' 155diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh 156--- perl-5.20.0-orig/hints/linux.sh 2014-05-26 15:34:20.000000000 +0200 157+++ perl-5.20.0/hints/linux.sh 2014-06-25 10:33:47.354883843 +0200 158@@ -150,25 +150,6 @@ 159 ;; 160 esac 161 162-# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries 163-# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us 164-# where to look. We don't want gcc's own libraries, however, so we 165-# filter those out. 166-# This could be conditional on Unbuntu, but other distributions may 167-# follow suit, and this scheme seems to work even on rather old gcc's. 168-# This unconditionally uses gcc because even if the user is using another 169-# compiler, we still need to find the math library and friends, and I don't 170-# know how other compilers will cope with that situation. 171-# Morever, if the user has their own gcc earlier in $PATH than the system gcc, 172-# we don't want its libraries. So we try to prefer the system gcc 173-# Still, as an escape hatch, allow Configure command line overrides to 174-# plibpth to bypass this check. 175-if [ -x /usr/bin/gcc ] ; then 176- gcc=/usr/bin/gcc 177-else 178- gcc=gcc 179-fi 180- 181 case "$plibpth" in 182 '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries | 183 cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'` 184@@ -178,32 +159,6 @@ 185 ;; 186 esac 187 188-case "$libc" in 189-'') 190-# If you have glibc, then report the version for ./myconfig bug reporting. 191-# (Configure doesn't need to know the specific version since it just uses 192-# gcc to load the library for all tests.) 193-# We don't use __GLIBC__ and __GLIBC_MINOR__ because they 194-# are insufficiently precise to distinguish things like 195-# libc-2.0.6 and libc-2.0.7. 196- for p in $plibpth 197- do 198- for trylib in libc.so.6 libc.so 199- do 200- if $test -e $p/$trylib; then 201- libc=`ls -l $p/$trylib | awk '{print $NF}'` 202- if $test "X$libc" != X; then 203- break 204- fi 205- fi 206- done 207- if $test "X$libc" != X; then 208- break 209- fi 210- done 211- ;; 212-esac 213- 214 # Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com> 215 # for this test. 216 cat >try.c <<'EOM' 217@@ -367,33 +322,6 @@ 218 ;; 219 esac 220 221-# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than 222-# true libraries. The scripts cause binding against static 223-# version of -lgdbm which is a bad idea. So if we have 'nm' 224-# make sure it can read the file 225-# NI-S 2003/08/07 226-case "$nm" in 227- '') ;; 228- *) 229- for p in $plibpth 230- do 231- if $test -r $p/libndbm.so; then 232- if $nm $p/libndbm.so >/dev/null 2>&1 ; then 233- echo 'Your shared -lndbm seems to be a real library.' 234- _libndbm_real=1 235- break 236- fi 237- fi 238- done 239- if $test "X$_libndbm_real" = X; then 240- echo 'Your shared -lndbm is not a real library.' 241- set `echo X "$libswanted "| sed -e 's/ ndbm / /'` 242- shift 243- libswanted="$*" 244- fi 245- ;; 246-esac 247- 248 # Linux on Synology. 249 if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then 250 # Tested on Synology DS213 and DS413