[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.0.0-34-g683fec6

git git at cross-lfs.org
Wed May 29 06:58:01 PDT 2013


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".

The branch, master has been updated
       via  683fec6623a30cc970b6ca2632e9ef0a269157df (commit)
      from  7b0c0669e08fec97d2ea83c3c4c507feef12e59a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 683fec6623a30cc970b6ca2632e9ef0a269157df
Author: William Harrington <kb0iic at berzerkula.org>
Date:   Wed May 29 08:57:56 2013 -0500

    Fix perl 5.18.0 libc patch.

diff --git a/patches/perl-5.18.0-libc-1.patch b/patches/perl-5.18.0-libc-1.patch
index e261824..77f9f27 100644
--- a/patches/perl-5.18.0-libc-1.patch
+++ b/patches/perl-5.18.0-libc-1.patch
@@ -15,29 +15,29 @@ Rename for 5.16.2 by William Harrington on 2012-11-01
 
 Rediffed: Against 5.18.0 by William Harrington on 2013-05-27
 
-diff -Naur perl-5.18.0/hints/linux.sh perl-5.18.0.new/hints/linux.sh
---- perl-5.18.0/hints/linux.sh	2013-05-27 22:07:36.081174614 +0000
-+++ perl-5.18.0.new/hints/linux.sh	2013-05-01 02:52:55.000000000 +0000
+diff -Naur perl-5.18.0.orig/hints/linux.sh perl-5.18.0/hints/linux.sh
+--- perl-5.18.0.orig/hints/linux.sh	2013-05-01 02:52:55.000000000 +0000
++++ perl-5.18.0/hints/linux.sh	2013-05-29 13:55:42.871771313 +0000
 @@ -66,9 +66,9 @@
  # 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 ${prefix}/lib/libc.so.6; then
--    libc=`ls -l ${prefix}/lib/libc.so.6 | awk '{print $NF}'`
--    libc=${prefix}/lib/$libc
-+if test -L /lib/libc.so.6; then
-+    libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'`
-+    libc=/lib/$libc
+-if test -L /lib/libc.so.6; then
+-    libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'`
+-    libc=/lib/$libc
++if test -L ${prefix}/lib/libc.so.6; then
++    libc=`ls -l ${prefix}/lib/libc.so.6 | awk '{print $NF}'`
++    libc=${prefix}/lib/$libc
  fi
  
  # Configure may fail to find lstat() since it's a static/inline
-@@ -456,9 +456,3 @@
+@@ -456,3 +456,9 @@
      libswanted="$libswanted pthread"
      ;;
  esac
--
--locincpth=""
--loclibpth=""
--glibpth="${prefix}/lib"
--usrinc="${prefix}/include"
--
++
++locincpth=""
++loclibpth=""
++glibpth="${prefix}/lib"
++usrinc="${prefix}/include"
++

-----------------------------------------------------------------------

Summary of changes:
 patches/perl-5.18.0-libc-1.patch |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book



More information about the Clfs-commits mailing list