···
1
+
diff --git a/Configure b/Configure
2
+
index e261cb9548..3bbbc4b9df 100755
5
+
@@ -108,15 +108,7 @@ if test -d c:/. || ( uname -a | grep -i 'os\(/\|\)2' 2>&1 ) 2>&1 >/dev/null ; th
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"
22
+
@@ -1455,8 +1447,7 @@ groupstype=''
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"
30
+
: no include file wanted by default
32
+
@@ -1470,17 +1461,12 @@ DEBUGGING=''
35
+
: change the next line if compiling for Xenix/286 on Xenix/386
36
+
-xlibpth='/usr/lib/386 /lib/386'
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"
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"
51
+
: Private path used by Configure to find libraries. Its value
52
+
: is prepended to libpth. This variable takes care of special
53
+
@@ -1515,8 +1501,6 @@ libswanted="cl pthread socket bind inet ndbm gdbm dbm db malloc dl ld"
54
+
libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD"
55
+
: We probably want to search /usr/shlib before most other libraries.
56
+
: This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
57
+
-glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
58
+
-glibpth="/usr/shlib $glibpth"
59
+
: Do not use vfork unless overridden by a hint file.
62
+
@@ -2581,7 +2565,6 @@ uname
65
+
pth=`echo $PATH | sed -e "s/$p_/ /g"`
66
+
-pth="$pth $sysroot/lib $sysroot/usr/lib"
67
+
for file in $loclist; do
70
+
@@ -5023,7 +5006,7 @@ esac
71
+
: Set private lib path
74
+
- plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib"
75
+
+ plibpth="$incpath/usr/lib"
79
+
@@ -8860,13 +8843,8 @@ esac
83
+
- syspath='/usr/share/man/man1 /usr/man/man1'
84
+
- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1"
85
+
- syspath="$syspath /usr/man/u_man/man1"
86
+
- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1"
87
+
- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1"
88
+
- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1"
89
+
- sysman=`./loc . /usr/man/man1 $syspath`
94
+
if $test -d "$sysman"; then
95
+
@@ -21500,9 +21478,10 @@ $rm_try tryp
101
+
: Store the full pathname to the sed program for use in the C program
105
+
: see what type gids are declared as in the kernel
107
+
diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
108
+
index ae647d5f06..9a05d66592 100644
109
+
--- a/ext/Errno/Errno_pm.PL
110
+
+++ b/ext/Errno/Errno_pm.PL
111
+
@@ -135,12 +135,7 @@ sub get_files {
112
+
if ($dep =~ /(\S+errno\.h)/) {
115
+
- } elsif ($^O eq 'linux' &&
116
+
- $Config{gccversion} ne '' &&
117
+
- $Config{gccversion} !~ /intel/i &&
118
+
- # might be using, say, Intel's icc
122
+
push(@file, $linux_errno_h);
123
+
} elsif ($^O eq 'haiku') {
124
+
# hidden in a special place
125
+
diff --git a/hints/freebsd.sh b/hints/freebsd.sh
126
+
index 4d26835e99..c6d365d84d 100644
127
+
--- a/hints/freebsd.sh
128
+
+++ b/hints/freebsd.sh
129
+
@@ -127,21 +127,21 @@ case "$osvers" in
130
+
objformat=`/usr/bin/objformat`
131
+
if [ x$objformat = xaout ]; then
132
+
if [ -e /usr/lib/aout ]; then
133
+
- libpth="/usr/lib/aout /usr/local/lib /usr/lib"
134
+
- glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
138
+
lddlflags='-Bshareable'
140
+
- libpth="/usr/lib /usr/local/lib"
141
+
- glibpth="/usr/lib /usr/local/lib"
145
+
lddlflags="-shared "
147
+
cccdlflags='-DPIC -fPIC'
150
+
- libpth="/usr/lib /usr/local/lib"
151
+
- glibpth="/usr/lib /usr/local/lib"
155
+
lddlflags="-shared "
156
+
cccdlflags='-DPIC -fPIC'
157
+
diff --git a/hints/linux.sh b/hints/linux.sh
158
+
index e1508c7509..5a187c583a 100644
159
+
--- a/hints/linux.sh
160
+
+++ b/hints/linux.sh
161
+
@@ -150,28 +150,6 @@ case "$optimize" in
165
+
-# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries
166
+
-# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us
167
+
-# where to look. We don't want gcc's own libraries, however, so we
168
+
-# filter those out.
169
+
-# This could be conditional on Ubuntu, but other distributions may
170
+
-# follow suit, and this scheme seems to work even on rather old gcc's.
171
+
-# This unconditionally uses gcc because even if the user is using another
172
+
-# compiler, we still need to find the math library and friends, and I don't
173
+
-# know how other compilers will cope with that situation.
174
+
-# Morever, if the user has their own gcc earlier in $PATH than the system gcc,
175
+
-# we don't want its libraries. So we try to prefer the system gcc
176
+
-# Still, as an escape hatch, allow Configure command line overrides to
177
+
-# plibpth to bypass this check.
178
+
-if [ -x /usr/bin/gcc ] ; then
180
+
-# clang also provides -print-search-dirs
181
+
-elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
188
+
'') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries |
189
+
cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
190
+
@@ -208,32 +186,6 @@ case "$usequadmath" in
196
+
-# If you have glibc, then report the version for ./myconfig bug reporting.
197
+
-# (Configure doesn't need to know the specific version since it just uses
198
+
-# gcc to load the library for all tests.)
199
+
-# We don't use __GLIBC__ and __GLIBC_MINOR__ because they
200
+
-# are insufficiently precise to distinguish things like
201
+
-# libc-2.0.6 and libc-2.0.7.
202
+
- for p in $plibpth
204
+
- for trylib in libc.so.6 libc.so
206
+
- if $test -e $p/$trylib; then
207
+
- libc=`ls -l $p/$trylib | awk '{print $NF}'`
208
+
- if $test "X$libc" != X; then
213
+
- if $test "X$libc" != X; then
220
+
if ${sh:-/bin/sh} -c exit; then
222
+
echo 'You appear to have a working bash. Good.'
223
+
@@ -311,33 +263,6 @@ sparc*)
227
+
-# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than
228
+
-# true libraries. The scripts cause binding against static
229
+
-# version of -lgdbm which is a bad idea. So if we have 'nm'
230
+
-# make sure it can read the file
235
+
- for p in $plibpth
237
+
- if $test -r $p/libndbm.so; then
238
+
- if $nm $p/libndbm.so >/dev/null 2>&1 ; then
239
+
- echo 'Your shared -lndbm seems to be a real library.'
245
+
- if $test "X$_libndbm_real" = X; then
246
+
- echo 'Your shared -lndbm is not a real library.'
247
+
- set `echo X "$libswanted "| sed -e 's/ ndbm / /'`
254
+
# Linux on Synology.
255
+
if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then
256
+
# Tested on Synology DS213 and DS413
pyrox.dev