Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml (revision 5f51e5572f6867cfee072ccacd0b412f1430877d)
+++ BOOK/introduction/common/changelog.xml (revision 6280055e5106597a3355f8c904b0443db64e48a4)
@@ -37,4 +37,14 @@
-->
+ 09 June 2017
+
+
+ [William Harrington] - Upgrade PERL to 5.26.0. Fixes
+ ticket #1167.
+
+
+
+
+
04 June 2017
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent (revision 5f51e5572f6867cfee072ccacd0b412f1430877d)
+++ BOOK/packages.ent (revision 6280055e5106597a3355f8c904b0443db64e48a4)
@@ -382,8 +382,8 @@
-
-
+
+
-
+
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent (revision 5f51e5572f6867cfee072ccacd0b412f1430877d)
+++ BOOK/patches.ent (revision 6280055e5106597a3355f8c904b0443db64e48a4)
@@ -73,5 +73,5 @@
-
+
Index: tches/perl-5.24.1-Configure_multilib-1.patch
===================================================================
--- patches/perl-5.24.1-Configure_multilib-1.patch (revision 5f51e5572f6867cfee072ccacd0b412f1430877d)
+++ (revision )
@@ -1,48 +1,0 @@
-Submitted By: William Harrington
-Date: 2017-05-14
-Initial Package Version: 5.12.0
-Origin: Cross-LFS
-Upstream Status: Not Applied - Internal to CLFS
-Description: This patch allows perl to be installed in /usr/lib32
- or /usr/lib64 instead of /usr/lib.
-
-Comments: Renamed for 5.24.1
-
-diff -Naur perl-5.20.0.orig/Configure perl-5.20.0/Configure
---- perl-5.20.0.orig/Configure 2014-05-26 13:34:18.000000000 +0000
-+++ perl-5.20.0/Configure 2014-05-30 01:43:45.621522372 +0000
-@@ -1359,6 +1359,7 @@
- glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
- test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
- test -f /shlib/libc.so && glibpth="/shlib $glibpth"
-+test -d /usr/lib32 && glibpth="$glibpth /lib32 /usr/lib32 /usr/local/lib32"
- test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
-
- : Private path used by Configure to find libraries. Its value
-@@ -6500,6 +6501,8 @@
- : The default "style" setting is made in installstyle.U
- case "$installstyle" in
- *lib/perl5*) set dflt privlib lib/$package/$version ;;
-+*lib32/perl5*) set dflt privlib lib32/$package/$version ;;
-+*lib64/perl5*) set dflt privlib lib64/$package/$version ;;
- *) set dflt privlib lib/$version ;;
- esac
- eval $prefixit
-@@ -6748,6 +6751,8 @@
- case "$sitelib" in
- '') case "$installstyle" in
- *lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
-+ *lib32/perl5*) dflt=$witeprefix/lib32/$package/site_$prog/$version ;;
-+ *lib64/perl5*) dflt=$siteprefix/lib64/$package/site_$prog/$version ;;
- *) dflt=$siteprefix/lib/site_$prog/$version ;;
- esac
- ;;
-@@ -7166,6 +7171,8 @@
- prog=`echo $package | $sed 's/-*[0-9.]*$//'`
- case "$installstyle" in
- *lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
-+ *lib32/perl5*) dflt=$vendorprefix/lib32/$package/vendor_$prog/$version ;;
-+ *lib64/perl5*) dflt=$vendorprefix/lib64/$package/vendor_$prog/$version ;;
- *) dflt=$vendorprefix/lib/vendor_$prog/$version ;;
- esac
- ;;
Index: patches/perl-5.26.0-Configure_multilib-1.patch
===================================================================
--- patches/perl-5.26.0-Configure_multilib-1.patch (revision 6280055e5106597a3355f8c904b0443db64e48a4)
+++ patches/perl-5.26.0-Configure_multilib-1.patch (revision 6280055e5106597a3355f8c904b0443db64e48a4)
@@ -0,0 +1,48 @@
+Submitted By: William Harrington
+Date: 2017-06-09
+Initial Package Version: 5.12.0
+Origin: Cross-LFS
+Upstream Status: Not Applied - Internal to CLFS
+Description: This patch allows perl to be installed in /usr/lib32
+ or /usr/lib64 instead of /usr/lib.
+
+Comments: Renamed for 5.26.0
+
+diff -Naur perl-5.20.0.orig/Configure perl-5.20.0/Configure
+--- perl-5.20.0.orig/Configure 2014-05-26 13:34:18.000000000 +0000
++++ perl-5.20.0/Configure 2014-05-30 01:43:45.621522372 +0000
+@@ -1359,6 +1359,7 @@
+ glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
+ test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
+ test -f /shlib/libc.so && glibpth="/shlib $glibpth"
++test -d /usr/lib32 && glibpth="$glibpth /lib32 /usr/lib32 /usr/local/lib32"
+ test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
+
+ : Private path used by Configure to find libraries. Its value
+@@ -6500,6 +6501,8 @@
+ : The default "style" setting is made in installstyle.U
+ case "$installstyle" in
+ *lib/perl5*) set dflt privlib lib/$package/$version ;;
++*lib32/perl5*) set dflt privlib lib32/$package/$version ;;
++*lib64/perl5*) set dflt privlib lib64/$package/$version ;;
+ *) set dflt privlib lib/$version ;;
+ esac
+ eval $prefixit
+@@ -6748,6 +6751,8 @@
+ case "$sitelib" in
+ '') case "$installstyle" in
+ *lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
++ *lib32/perl5*) dflt=$witeprefix/lib32/$package/site_$prog/$version ;;
++ *lib64/perl5*) dflt=$siteprefix/lib64/$package/site_$prog/$version ;;
+ *) dflt=$siteprefix/lib/site_$prog/$version ;;
+ esac
+ ;;
+@@ -7166,6 +7171,8 @@
+ prog=`echo $package | $sed 's/-*[0-9.]*$//'`
+ case "$installstyle" in
+ *lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
++ *lib32/perl5*) dflt=$vendorprefix/lib32/$package/vendor_$prog/$version ;;
++ *lib64/perl5*) dflt=$vendorprefix/lib64/$package/vendor_$prog/$version ;;
+ *) dflt=$vendorprefix/lib/vendor_$prog/$version ;;
+ esac
+ ;;