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