Changeset 229ed25 for patches/perl-5.18.1-libc-1.patch

Timestamp:

Jan 4, 2014, 12:03:38 AM (12 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f90d077

Parents:

ec008670 (diff), e57ce38 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:

• patches/perl-5.18.1-libc-1.patch (moved) (moved from patches/perl-5.14.0-libc-1.patch ) (3 diffs)

patches/perl-5.18.1-libc-1.patch

@@ -1 +1 @@
 Submitted By: Jonathan Norman <Jonathan at bluesquarelinux.co.uk>
-Date: 2011-05-17
+Date: 2013-08-13
 Initial Package Version: 5.8.8
 Origin: Ryan Oliver
@@ -11 +11 @@
           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
+Rename for 5.16.2 by William Harrington on 2012-11-01
 
-diff -Naur perl-5.14.0.orig/hints/linux.sh perl-5.14.0/hints/linux.sh
---- perl-5.14.0.orig/hints/linux.sh     2011-05-17 10:15:25.836817125 +0000
-+++ perl-5.14.0/hints/linux.sh  2011-05-17 10:17:15.472650338 +0000
-@@ -63,9 +63,9 @@
+Rediffed: Against 5.18.0 by William Harrington on 2013-05-27
+Rediffed: Against 5.18.1 by William Harrington on 2013-08-13
+
+diff -Naur perl-5.18.1.orig/hints/linux.sh perl-5.18.1/hints/linux.sh
+--- perl-5.18.1.orig/hints/linux.sh     2013-08-12 02:44:48.000000000 +0000
++++ perl-5.18.1/hints/linux.sh  2013-08-13 16:46:38.594653439 +0000
+@@ -66,9 +66,9 @@
  # We don't use __GLIBC__ and  __GLIBC_MINOR__ because they
  # are insufficiently precise to distinguish things like
@@ -28 +33 @@
  
  # Configure may fail to find lstat() since it's a static/inline
-@@ -461,3 +461,9 @@
+@@ -456,3 +456,9 @@
      libswanted="$libswanted pthread"
      ;;