source:
patches/perl-5.16.1-libc-1.patch@
2920fa0
Last change on this file since 2920fa0 was 06b2d12, checked in by , 12 years ago | |
---|---|
|
|
File size: 16.9 KB |
-
hints/linux.sh
Submitted By: Jonathan Norman <Jonathan at bluesquarelinux.co.uk> Date: 2011-05-17 Initial Package Version: 5.8.8 Origin: Ryan Oliver Upstream Status: Unknown Description: This patch adapts some hard-wired paths to the C library. It uses the $prefix variable to locate the correct libc. Rediffed: Against 5.10.0 by Joe Ciccone on 2008-08-30 Against 5.10.1 By Jim Gifford on 2009-08-25 Against 5.12.1 By Joe Ciccone on 2010-08-01 Against 5.14.0 By Jonathan Norman on 2011-05-17 Against 5.16.1 by William Harrington on 2012-08-26 diff -Naur perl-5.16.1.orig/hints/linux.sh perl-5.16.1/hints/linux.sh
old new 66 66 # We don't use __GLIBC__ and __GLIBC_MINOR__ because they 67 67 # are insufficiently precise to distinguish things like 68 68 # libc-2.0.6 and libc-2.0.7. 69 if test -L /lib/libc.so.6; then70 libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'`71 libc= /lib/$libc69 if test -L ${prefix}/lib/libc.so.6; then 70 libc=`ls -l ${prefix}/lib/libc.so.6 | awk '{print $NF}'` 71 libc=${prefix}/lib/$libc 72 72 fi 73 73 74 74 # Configure may fail to find lstat() since it's a static/inline … … 466 466 libswanted="$libswanted pthread" 467 467 ;; 468 468 esac 469 470 locincpth="" 471 loclibpth="" 472 glibpth="${prefix}/lib" 473 usrinc="${prefix}/include" 474 -
hints/linux.sh.orig
diff -Naur perl-5.16.1.orig/hints/linux.sh.orig perl-5.16.1/hints/linux.sh.orig
old new 1 # hints/linux.sh 2 # Original version by rsanders 3 # Additional support by Kenneth Albanowski <kjahds@kjahds.com> 4 # 5 # ELF support by H.J. Lu <hjl@nynexst.com> 6 # Additional info from Nigel Head <nhead@ESOC.bitnet> 7 # and Kenneth Albanowski <kjahds@kjahds.com> 8 # 9 # Consolidated by Andy Dougherty <doughera@lafayette.edu> 10 # 11 # Updated Thu Feb 8 11:56:10 EST 1996 12 13 # Updated Thu May 30 10:50:22 EDT 1996 by <doughera@lafayette.edu> 14 15 # Updated Fri Jun 21 11:07:54 EDT 1996 16 # NDBM support for ELF re-enabled by <kjahds@kjahds.com> 17 18 # No version of Linux supports setuid scripts. 19 d_suidsafe='undef' 20 21 # No version of Linux needs libutil for perl. 22 i_libutil='undef' 23 24 # Debian and Red Hat, and perhaps other vendors, provide both runtime and 25 # development packages for some libraries. The runtime packages contain shared 26 # libraries with version information in their names (e.g., libgdbm.so.1.7.3); 27 # the development packages supplement this with versionless shared libraries 28 # (e.g., libgdbm.so). 29 # 30 # If you want to link against such a library, you must install the development 31 # version of the package. 32 # 33 # These packages use a -dev naming convention in both Debian and Red Hat: 34 # libgdbmg1 (non-development version of GNU libc 2-linked GDBM library) 35 # libgdbmg1-dev (development version of GNU libc 2-linked GDBM library) 36 # So make sure that for any libraries you wish to link Perl with under 37 # Debian or Red Hat you have the -dev packages installed. 38 39 # SuSE Linux can be used as cross-compilation host for Cray XT4 Catamount/Qk. 40 if test -d /opt/xt-pe 41 then 42 case "`cc -V 2>&1`" in 43 *catamount*) . hints/catamount.sh; return ;; 44 esac 45 fi 46 47 # Some operating systems (e.g., Solaris 2.6) will link to a versioned shared 48 # library implicitly. For example, on Solaris, `ld foo.o -lgdbm' will find an 49 # appropriate version of libgdbm, if one is available; Linux, however, doesn't 50 # do the implicit mapping. 51 ignore_versioned_solibs='y' 52 53 # BSD compatibility library no longer needed 54 # 'kaffe' has a /usr/lib/libnet.so which is not at all relevant for perl. 55 # bind causes issues with several reentrant functions 56 set `echo X "$libswanted "| sed -e 's/ bsd / /' -e 's/ net / /' -e 's/ bind / /'` 57 shift 58 libswanted="$*" 59 60 # Debian 4.0 puts ndbm in the -lgdbm_compat library. 61 libswanted="$libswanted gdbm_compat" 62 63 # If you have glibc, then report the version for ./myconfig bug reporting. 64 # (Configure doesn't need to know the specific version since it just uses 65 # gcc to load the library for all tests.) 66 # We don't use __GLIBC__ and __GLIBC_MINOR__ because they 67 # are insufficiently precise to distinguish things like 68 # libc-2.0.6 and libc-2.0.7. 69 if test -L /lib/libc.so.6; then 70 libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'` 71 libc=/lib/$libc 72 fi 73 74 # Configure may fail to find lstat() since it's a static/inline 75 # function in <sys/stat.h>. 76 d_lstat=define 77 78 # malloc wrap works 79 case "$usemallocwrap" in 80 '') usemallocwrap='define' ;; 81 esac 82 83 # The system malloc() is about as fast and as frugal as perl's. 84 # Since the system malloc() has been the default since at least 85 # 5.001, we might as well leave it that way. --AD 10 Jan 2002 86 case "$usemymalloc" in 87 '') usemymalloc='n' ;; 88 esac 89 90 # Check if we're about to use Intel's ICC compiler 91 case "`${cc:-cc} -V 2>&1`" in 92 *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*) 93 # record the version, formats: 94 # icc (ICC) 10.1 20080801 95 # icpc (ICC) 10.1 20080801 96 # followed by a copyright on the second line 97 ccversion=`${cc:-cc} --version | sed -n -e 's/^icp\?c \((ICC) \)\?//p'` 98 # This is needed for Configure's prototype checks to work correctly 99 # The -mp flag is needed to pass various floating point related tests 100 # The -no-gcc flag is needed otherwise, icc pretends (poorly) to be gcc 101 ccflags="-we147 -mp -no-gcc $ccflags" 102 # Prevent relocation errors on 64bits arch 103 case "`uname -m`" in 104 *ia64*|*x86_64*) 105 cccdlflags='-fPIC' 106 ;; 107 esac 108 # If we're using ICC, we usually want the best performance 109 case "$optimize" in 110 '') optimize='-O3' ;; 111 esac 112 ;; 113 *" Sun "*"C"*) 114 # Sun's C compiler, which might have a 'tag' name between 115 # 'Sun' and the 'C': Examples: 116 # cc: Sun C 5.9 Linux_i386 Patch 124871-01 2007/07/31 117 # cc: Sun Ceres C 5.10 Linux_i386 2008/07/10 118 test "$optimize" || optimize='-xO2' 119 cccdlflags='-KPIC' 120 lddlflags='-G -Bdynamic' 121 # Sun C doesn't support gcc attributes, but, in many cases, doesn't 122 # complain either. Not all cases, though. 123 d_attribute_format='undef' 124 d_attribute_malloc='undef' 125 d_attribute_nonnull='undef' 126 d_attribute_noreturn='undef' 127 d_attribute_pure='undef' 128 d_attribute_unused='undef' 129 d_attribute_warn_unused_result='undef' 130 ;; 131 esac 132 133 case "$optimize" in 134 # use -O2 by default ; -O3 doesn't seem to bring significant benefits with gcc 135 '') 136 optimize='-O2' 137 case "`uname -m`" in 138 ppc*) 139 # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy 140 # with -O2 ; so downgrade to -O1. 141 optimize='-O1' 142 ;; 143 ia64*) 144 # This architecture has had various problems with gcc's 145 # in the 3.2, 3.3, and 3.4 releases when optimized to -O2. See 146 # RT #37156 for a discussion of the problem. 147 case "`${cc:-gcc} -v 2>&1`" in 148 *"version 3.2"*|*"version 3.3"*|*"version 3.4"*) 149 ccflags="-fno-delete-null-pointer-checks $ccflags" 150 ;; 151 esac 152 ;; 153 esac 154 ;; 155 esac 156 157 # Ubuntu 11.04 (and later, presumably) doesn't keep most libraries 158 # (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us 159 # where to look. We don't want gcc's own libraries, however, so we 160 # filter those out. 161 # This could be conditional on Unbuntu, but other distributions may 162 # follow suit, and this scheme seems to work even on rather old gcc's. 163 # This unconditionally uses gcc because even if the user is using another 164 # compiler, we still need to find the math library and friends, and I don't 165 # know how other compilers will cope with that situation. 166 # Morever, if the user has their own gcc earlier in $PATH than the system gcc, 167 # we don't want its libraries. So we try to prefer the system gcc 168 # Still, as an escape hatch, allow Configure command line overrides to 169 # plibpth to bypass this check. 170 if [ -x /usr/bin/gcc ] ; then 171 gcc=/usr/bin/gcc 172 else 173 gcc=gcc 174 fi 175 176 case "$plibpth" in 177 '') plibpth=`LANG=C LC_ALL=C $gcc -print-search-dirs | grep libraries | 178 cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'` 179 set X $plibpth # Collapse all entries on one line 180 shift 181 plibpth="$*" 182 ;; 183 esac 184 185 # Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com> 186 # for this test. 187 cat >try.c <<'EOM' 188 /* Test for whether ELF binaries are produced */ 189 #include <fcntl.h> 190 #include <stdlib.h> 191 #include <unistd.h> 192 main() { 193 char buffer[4]; 194 int i=open("a.out",O_RDONLY); 195 if(i==-1) 196 exit(1); /* fail */ 197 if(read(i,&buffer[0],4)<4) 198 exit(1); /* fail */ 199 if(buffer[0] != 127 || buffer[1] != 'E' || 200 buffer[2] != 'L' || buffer[3] != 'F') 201 exit(1); /* fail */ 202 exit(0); /* succeed (yes, it's ELF) */ 203 } 204 EOM 205 if ${cc:-gcc} try.c >/dev/null 2>&1 && $run ./a.out; then 206 cat <<'EOM' >&4 207 208 You appear to have ELF support. I'll try to use it for dynamic loading. 209 If dynamic loading doesn't work, read hints/linux.sh for further information. 210 EOM 211 212 else 213 cat <<'EOM' >&4 214 215 You don't have an ELF gcc. I will use dld if possible. If you are 216 using a version of DLD earlier than 3.2.6, or don't have it at all, you 217 should probably upgrade. If you are forced to use 3.2.4, you should 218 uncomment a couple of lines in hints/linux.sh and restart Configure so 219 that shared libraries will be disallowed. 220 221 EOM 222 lddlflags="-r $lddlflags" 223 # These empty values are so that Configure doesn't put in the 224 # Linux ELF values. 225 ccdlflags=' ' 226 cccdlflags=' ' 227 ccflags="-DOVR_DBL_DIG=14 $ccflags" 228 so='sa' 229 dlext='o' 230 nm_so_opt=' ' 231 ## If you are using DLD 3.2.4 which does not support shared libs, 232 ## uncomment the next two lines: 233 #ldflags="-static" 234 #so='none' 235 236 # In addition, on some systems there is a problem with perl and NDBM 237 # which causes AnyDBM and NDBM_File to lock up. This is evidenced 238 # in the tests as AnyDBM just freezing. Apparently, this only 239 # happens on a.out systems, so we disable NDBM for all a.out linux 240 # systems. If someone can suggest a more robust test 241 # that would be appreciated. 242 # 243 # More info: 244 # Date: Wed, 7 Feb 1996 03:21:04 +0900 245 # From: Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp> 246 # 247 # I tried compiling with DBM support and sure enough things locked up 248 # just as advertised. Checking into it, I found that the lockup was 249 # during the call to dbm_open. Not *in* dbm_open -- but between the call 250 # to and the jump into. 251 # 252 # To make a long story short, making sure that the *.a and *.sa pairs of 253 # /usr/lib/lib{m,db,gdbm}.{a,sa} 254 # were perfectly in sync took care of it. 255 # 256 # This will generate a harmless Whoa There! message 257 case "$d_dbm_open" in 258 '') cat <<'EOM' >&4 259 260 Disabling ndbm. This will generate a Whoa There message in Configure. 261 Read hints/linux.sh for further information. 262 EOM 263 # You can override this with Configure -Dd_dbm_open 264 d_dbm_open=undef 265 ;; 266 esac 267 fi 268 269 rm -f try.c a.out 270 271 if /bin/sh -c exit; then 272 echo '' 273 echo 'You appear to have a working bash. Good.' 274 else 275 cat << 'EOM' >&4 276 277 *********************** Warning! ********************* 278 It would appear you have a defective bash shell installed. This is likely to 279 give you a failure of op/exec test #5 during the test phase of the build, 280 Upgrading to a recent version (1.14.4 or later) should fix the problem. 281 ****************************************************** 282 EOM 283 284 fi 285 286 # On SPARClinux, 287 # The following csh consistently coredumped in the test directory 288 # "/home/mikedlr/perl5.003_94/t", though not most other directories. 289 290 #Name : csh Distribution: Red Hat Linux (Rembrandt) 291 #Version : 5.2.6 Vendor: Red Hat Software 292 #Release : 3 Build Date: Fri May 24 19:42:14 1996 293 #Install date: Thu Jul 11 16:20:14 1996 Build Host: itchy.redhat.com 294 #Group : Shells Source RPM: csh-5.2.6-3.src.rpm 295 #Size : 184417 296 #Description : BSD c-shell 297 298 # For this reason I suggest using the much bug-fixed tcsh for globbing 299 # where available. 300 301 # November 2001: That warning's pretty old now and probably not so 302 # relevant, especially since perl now uses File::Glob for globbing. 303 # We'll still look for tcsh, but tone down the warnings. 304 # Andy Dougherty, Nov. 6, 2001 305 if $csh -c 'echo $version' >/dev/null 2>&1; then 306 echo 'Your csh is really tcsh. Good.' 307 else 308 if xxx=`./UU/loc tcsh blurfl $pth`; $test -f "$xxx"; then 309 echo "Found tcsh. I'll use it for globbing." 310 # We can't change Configure's setting of $csh, due to the way 311 # Configure handles $d_portable and commands found in $loclist. 312 # We can set the value for CSH in config.h by setting full_csh. 313 full_csh=$xxx 314 elif [ -f "$csh" ]; then 315 echo "Couldn't find tcsh. Csh-based globbing might be broken." 316 fi 317 fi 318 319 # Shimpei Yamashita <shimpei@socrates.patnet.caltech.edu> 320 # Message-Id: <33EF1634.B36B6500@pobox.com> 321 # 322 # The DR2 of MkLinux (osname=linux,archname=ppc-linux) may need 323 # special flags passed in order for dynamic loading to work. 324 # instead of the recommended: 325 # 326 # ccdlflags='-rdynamic' 327 # 328 # it should be: 329 # ccdlflags='-Wl,-E' 330 # 331 # So if your DR2 (DR3 came out summer 1998, consider upgrading) 332 # has problems with dynamic loading, uncomment the 333 # following three lines, make distclean, and re-Configure: 334 #case "`uname -r | sed 's/^[0-9.-]*//'``arch`" in 335 #'osfmach3ppc') ccdlflags='-Wl,-E' ;; 336 #esac 337 338 case "`uname -m`" in 339 sparc*) 340 case "$cccdlflags" in 341 *-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;; 342 *-fPIC*) ;; 343 *) cccdlflags="$cccdlflags -fPIC" ;; 344 esac 345 ;; 346 esac 347 348 # SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than 349 # true libraries. The scripts cause binding against static 350 # version of -lgdbm which is a bad idea. So if we have 'nm' 351 # make sure it can read the file 352 # NI-S 2003/08/07 353 if [ -r /usr/lib/libndbm.so -a -x /usr/bin/nm ] ; then 354 if /usr/bin/nm /usr/lib/libndbm.so >/dev/null 2>&1 ; then 355 echo 'Your shared -lndbm seems to be a real library.' 356 else 357 echo 'Your shared -lndbm is not a real library.' 358 set `echo X "$libswanted "| sed -e 's/ ndbm / /'` 359 shift 360 libswanted="$*" 361 fi 362 fi 363 364 365 # This script UU/usethreads.cbu will get 'called-back' by Configure 366 # after it has prompted the user for whether to use threads. 367 cat > UU/usethreads.cbu <<'EOCBU' 368 case "$usethreads" in 369 $define|true|[yY]*) 370 ccflags="-D_REENTRANT -D_GNU_SOURCE $ccflags" 371 if echo $libswanted | grep -v pthread >/dev/null 372 then 373 set `echo X "$libswanted "| sed -e 's/ c / pthread c /'` 374 shift 375 libswanted="$*" 376 fi 377 378 # Somehow at least in Debian 2.2 these manage to escape 379 # the #define forest of <features.h> and <time.h> so that 380 # the hasproto macro of Configure doesn't see these protos, 381 # even with the -D_GNU_SOURCE. 382 383 d_asctime_r_proto="$define" 384 d_crypt_r_proto="$define" 385 d_ctime_r_proto="$define" 386 d_gmtime_r_proto="$define" 387 d_localtime_r_proto="$define" 388 d_random_r_proto="$define" 389 390 ;; 391 esac 392 EOCBU 393 394 cat > UU/uselargefiles.cbu <<'EOCBU' 395 # This script UU/uselargefiles.cbu will get 'called-back' by Configure 396 # after it has prompted the user for whether to use large files. 397 case "$uselargefiles" in 398 ''|$define|true|[yY]*) 399 # Keep this in the left margin. 400 ccflags_uselargefiles="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" 401 402 ccflags="$ccflags $ccflags_uselargefiles" 403 ;; 404 esac 405 EOCBU 406 407 # Purify fails to link Perl if a "-lc" is passed into its linker 408 # due to duplicate symbols. 409 case "$PURIFY" in 410 $define|true|[yY]*) 411 set `echo X "$libswanted "| sed -e 's/ c / /'` 412 shift 413 libswanted="$*" 414 ;; 415 esac 416 417 # If we are using g++ we must use nm and force ourselves to use 418 # the /usr/lib/libc.a (resetting the libc below to an empty string 419 # makes Configure to look for the right one) because the symbol 420 # scanning tricks of Configure will crash and burn horribly. 421 case "$cc" in 422 *g++*) usenm=true 423 libc='' 424 ;; 425 esac 426 427 # If using g++, the Configure scan for dlopen() and (especially) 428 # dlerror() might fail, easier just to forcibly hint them in. 429 case "$cc" in 430 *g++*) 431 d_dlopen='define' 432 d_dlerror='define' 433 ;; 434 esac 435 436 # Under some circumstances libdb can get built in such a way as to 437 # need pthread explicitly linked. 438 439 libdb_needs_pthread="N" 440 441 if echo " $libswanted " | grep -v " pthread " >/dev/null 442 then 443 if echo " $libswanted " | grep " db " >/dev/null 444 then 445 for DBDIR in $glibpth 446 do 447 DBLIB="$DBDIR/libdb.so" 448 if [ -f $DBLIB ] 449 then 450 if nm -u $DBLIB | grep pthread >/dev/null 451 then 452 if ldd $DBLIB | grep pthread >/dev/null 453 then 454 libdb_needs_pthread="N" 455 else 456 libdb_needs_pthread="Y" 457 fi 458 fi 459 fi 460 done 461 fi 462 fi 463 464 case "$libdb_needs_pthread" in 465 "Y") 466 libswanted="$libswanted pthread" 467 ;; 468 esac
Note:
See TracBrowser
for help on using the repository browser.