Changeset 229ed25 for patches/perl-5.18.1-Configure_multilib-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-Configure_multilib-1.patch (moved) (moved from patches/perl-5.14.0-Configure_multilib-1.patch ) (4 diffs)

patches/perl-5.18.1-Configure_multilib-1.patch

@@ -1 +1 @@
 Submitted By: Ryan Oliver <ryan dot oliver at pha dot com dot au>
-Date: 2010-08-01
+Date: 2013-08-13
 Initial Package Version: 5.8.8
 Origin: Ryan Oliver
@@ -10 +10 @@
           Against 5.10.1 By Jim Gifford on 2009-08-25
           Against 5.12.1 By Joe Ciccone on 2010-08-01
+          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.12.1.orig/Configure perl-5.12.1/Configure
---- perl-5.12.1.orig/Configure  2010-05-13 18:01:07.000000000 -0400
-+++ perl-5.12.1/Configure       2010-08-01 18:18:19.614326794 -0400
-@@ -6254,6 +6254,8 @@
+Rediffed: Against 5.18.0 by William Harrington on 2013-05-28
+Rediffed: Against 5.18.1 by William Harrington on 2013-08-13
+
+diff -Naur perl-5.18.1.orig/Configure perl-5.18.1/Configure
+--- perl-5.18.1.orig/Configure  2013-08-12 02:44:47.000000000 +0000
++++ perl-5.18.1/Configure       2013-08-13 16:47:20.188650223 +0000
+@@ -6219,6 +6219,8 @@
  : The default "style" setting is made in installstyle.U
  case "$installstyle" in
@@ -23 +28 @@
  esac
  eval $prefixit
-@@ -6502,6 +6504,8 @@
+@@ -6467,6 +6469,8 @@
  case "$sitelib" in
  '') case "$installstyle" in
@@ -32 +37 @@
         esac
         ;;
-@@ -7020,6 +7024,8 @@
+@@ -6986,6 +6990,8 @@
                 prog=`echo $package | $sed 's/-*[0-9.]*$//'`
                 case "$installstyle" in