[lfs-patches] r2463 - trunk/perl

dj at linuxfromscratch.org dj at linuxfromscratch.org
Mon Jun 4 13:59:10 PDT 2012


Author: dj
Date: 2012-06-04 14:59:05 -0600 (Mon, 04 Jun 2012)
New Revision: 2463

Added:
   trunk/perl/perl-5.16.0-libc-2.patch
Log:
Updated perl-5.16.0-libc patch.

Added: trunk/perl/perl-5.16.0-libc-2.patch
===================================================================
--- trunk/perl/perl-5.16.0-libc-2.patch	                        (rev 0)
+++ trunk/perl/perl-5.16.0-libc-2.patch	2012-06-04 20:59:05 UTC (rev 2463)
@@ -0,0 +1,49 @@
+Submitted By: DJ Lucas <dj at linuxfromscratch dot org>
+Date: 2012-06-04
+Initial Package Version: 5.16.0
+Origin: Previous Perl-libc patch
+Status: Not Submitted - LFS Specific
+Description: This patch adapts some hard-wired paths to the C library and gcc.
+             It uses the $prefix variable to locate the correct libc.
+
+diff -Naurp perl-5.16.0-orig/hints/linux.sh perl-5.16.0/hints/linux.sh
+--- perl-5.16.0-orig/hints/linux.sh	2012-06-04 19:23:04.000000000 +0000
++++ perl-5.16.0/hints/linux.sh	2012-06-04 19:23:56.000000000 +0000
+@@ -66,9 +66,9 @@ libswanted="$libswanted gdbm_compat"
+ # We don't use __GLIBC__ and  __GLIBC_MINOR__ because they
+ # are insufficiently precise to distinguish things like
+ # libc-2.0.6 and libc-2.0.7.
+-if test -L /lib/libc.so.6; then
++if test -L ${prefix}/lib/libc.so.6; then
+     libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'`
+-    libc=/lib/$libc
++    libc=${prefix}/lib/$libc
+ fi
+ 
+ # Configure may fail to find lstat() since it's a static/inline
+@@ -167,11 +167,11 @@ esac
+ # we don't want its libraries. So we try to prefer the system gcc
+ # Still, as an escape hatch, allow Configure command line overrides to
+ # plibpth to bypass this check.
+-if [ -x /usr/bin/gcc ] ; then
+-    gcc=/usr/bin/gcc
+-else
++#if [ -x /usr/bin/gcc ] ; then
++#    gcc=/usr/bin/gcc
++#else
+     gcc=gcc
+-fi
++#fi
+ 
+ case "$plibpth" in
+ '') plibpth=`LANG=C LC_ALL=C $gcc -print-search-dirs | grep libraries |
+@@ -466,3 +466,8 @@ case "$libdb_needs_pthread" in
+     libswanted="$libswanted pthread"
+     ;;
+ esac
++
++locincpth=""
++loclibpth=""
++glibpth="${prefix}/lib"
++usrinc="${prefix}/include"
+




More information about the patches mailing list