[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, sysvinit, updated. clfs-2.1.0-1164-g452e11e
git
git at cross-lfs.org
Fri May 30 01:23:20 PDT 2014
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, sysvinit has been updated
via 452e11e9a4ec4a7956ff793f4bed2b184b76fb9d (commit)
via 15bbf0e98bb0d758e4426cd74cd1f64c16bad0d5 (commit)
via 06f33c638cb82722c8f0b1ab944e7787f0cb5712 (commit)
via 149f9af5fc857370cde9deaa6d2783639dcaab46 (commit)
via 39bf018a911b01b82b65b7d7e49b19a9c94d958b (commit)
via d57a1c5f3f079f8028db766873095da315beb8ed (commit)
via c463a878dc134b57ac06193aac1e5873aa4baf87 (commit)
via 00e1ebc015cdfdd32bf5ad19e4381402527c6bd9 (commit)
via c3366527955bb75fb0865abbbda5e373ad4b9aa0 (commit)
via 5433fa6f0dfb9542e9abdc8f30f75460abedc95f (commit)
via 10496d38a38841d7762170b1258b7b45b7c989f2 (commit)
from cdf768f4688082c83ad43f3c390ac66856c868e6 (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 452e11e9a4ec4a7956ff793f4bed2b184b76fb9d
Merge: 15bbf0e cdf768f
Author: Chris Staub <chris at beaker67.com>
Date: Fri May 30 04:23:06 2014 -0400
Merge branch 'sysvinit' of git.cross-lfs.org:cross-lfs into sysvinit
commit 15bbf0e98bb0d758e4426cd74cd1f64c16bad0d5
Author: Chris Staub <chris at beaker67.com>
Date: Fri May 30 04:21:33 2014 -0400
Updates to choose page
diff --git a/BOOK/temp-system/common/choose.xml b/BOOK/temp-system/common/choose.xml
index 7a40610..3cbf77b 100644
--- a/BOOK/temp-system/common/choose.xml
+++ b/BOOK/temp-system/common/choose.xml
@@ -13,46 +13,44 @@
<para os="a"> There are two different ways you can proceed from this point
to build the final system. You can build a kernel, a bootloader, and
a few other utilities, boot into the temporary system, and build the
- rest there. Alternatively, you can chroot into the temporary system.</para>
+ rest there. Alternatively, you can mount a few virtual filesystems and
+ chroot into the temporary system.</para>
- <para os="b">The <command>chroot</command> (change root) program is used to enter
- a virtual environment and start a new shell whose root directory will be set
- to the CLFS partition. This is very similar to rebooting and instructing the
- kernel to mount the CLFS partition as the root partition.
+ <para os="b">The <command>chroot</command> (change root) program is used to
+ enter a virtual environment and start a new shell whose root directory will
+ be set to the CLFS partition. This is very similar to rebooting and
+ instructing the kernel to mount the CLFS partition as the root partition.
The major advantage is that <quote>chrooting</quote> allows the builder to
continue using the host while CLFS is being built. While waiting for package
compilation to complete, a user can switch to a different virtual console
(VC) or X desktop and continue using the computer as normal.</para>
- <para os="c">Some systems cannot be built by chrooting so they must be
- booted instead. Generally, if you building for a different arch than
- the host system, you must reboot because the kernel will likely not
- support the target machine. Booting involves installing a few
- additional packages that are needed for bootup, installing
- boot-scripts, and building a miminal kernel.<!-- We also describe some
- alternative booting methods in <xref linkend="ch-boot-whatnext"/> -->
- The boot method is needed when you are building on a different
- architecture. For example, if you are building a PowerPC system from
- an x86, you can't chroot. The chroot method is for when you are
- building on the same architecture. If you are building on, and for,
- an x86 system, you can simply chroot. The rule of thumb here is if
- the architectures match and you are running the same series kernel
- you can just chroot. If you aren't running the same series kernel, or are
- wanting to run a different ABI, you will need to use the boot option.</para>
+ <!-- We also describe some alternative booting methods in <xref linkend="ch-boot-whatnext"/> -->
+
+ <para os="c">The main downside to chrooting is that you are more limited in
+ when you can use it - booting will always work for any CLFS build, but the
+ chroot method can only be used when you are building on the same
+ architecture. For example, if you are building on, and for, an x86 system,
+ you can simply chroot. Booting is required when you are compiling for a
+ different architecture, such as building a PowerPC system from an x86. The
+ rule of thumb here is that if the architectures match and you are running
+ the same series kernel you can just chroot. If you aren't running the same
+ series kernel, or are wanting to run a different ABI, you will need to use
+ the boot option.</para>
<para os="d">If you are in any doubt about this, you can try the following
- commands to see if you can chroot:</para>
+ commands to see if you can chroot:</para>
<screen os="e"><userinput>/tools/lib/libc.so.6
/tools/bin/gcc -v</userinput></screen>
- <para os="f">If either of these commands fail, you will have to follow the boot
- method.</para>
+ <para os="f">If either of these commands fail, you will have to follow the
+ boot method.</para>
- <para os="g">To chroot, you will also need a Linux Kernel-2.6.32 or greater
- (having been compiled with GCC-4.1.2 or greater). The reason for the
- kernel version requirement is that Glibc is built to generate the library
- for the smallest version of the Linux kernel expected to be supported.</para>
+ <para os="g">To chroot, you will also need a Linux Kernel, version
+ 2.6.32 or higher, having been compiled with GCC-4.1.2 or greater.
+ This is required because Glibc was built to generate libraries for the
+ smallest version of the Linux kernel expected to be supported.</para>
<para os="h">To check your kernel version, run <command>cat /proc/version</command>
- if it does not say that you are running a 2.6.32 or later Linux kernel,
commit 06f33c638cb82722c8f0b1ab944e7787f0cb5712
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Thu May 29 08:54:34 2014 -0500
Update perl 5.20.0 configure multilib patch content and size and md5 hash.
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 839c98a..73ac868 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -81,8 +81,8 @@
<!ENTITY iproute2-libdir-patch-size "1.990 KB">
<!ENTITY perl-multilib-patch "perl-&perl-version;-Configure_multilib-1.patch">
-<!ENTITY perl-multilib-patch-md5 "x6c1df5fac5c88f9a79963a19e6f8bc02">
-<!ENTITY perl-multilib-patch-size "2.055 KB">
+<!ENTITY perl-multilib-patch-md5 "6e6d589a09c746a2318b6200bd1aa733">
+<!ENTITY perl-multilib-patch-size "2.002 KB">
<!-- Start of Pure64 patches -->
diff --git a/patches/perl-5.20.0-Configure_multilib-1.patch b/patches/perl-5.20.0-Configure_multilib-1.patch
index 9d9f384..9b08d46 100644
--- a/patches/perl-5.20.0-Configure_multilib-1.patch
+++ b/patches/perl-5.20.0-Configure_multilib-1.patch
@@ -1,27 +1,23 @@
-Submitted By: Ryan Oliver <ryan dot oliver at pha dot com dot au>
-Date: 2013-08-13
-Initial Package Version: 5.8.8
-Origin: Ryan Oliver
-Upstream Status: Unknown
+Submitted By: William Harrington <kb0iic at cross-lfs dot org>
+Date: 2014-29-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.
-Rediffed: Against 5.10.0 by Joe Ciccone on 2008-08-30
- 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
-
-Rediffed: Against 5.18.0 by William Harrington on 2013-05-28
-Rediffed: Against 5.18.1 by William Harrington on 2013-08-13
-Rediffed: Against 5.18.2 by Chris Staub on 2014-01-10
-
-Rename for 5.20.0 by William Harrington on 2014-05-29
-
-diff -Naur perl-5.18.2.orig/Configure perl-5.18.2/Configure
---- perl-5.18.2.orig/Configure 2014-01-06 17:46:42.000000000 -0500
-+++ perl-5.18.2/Configure 2014-01-10 02:38:43.000000000 -0500
-@@ -6219,6 +6219,8 @@
+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-29 13:23:29.534283207 +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 ;;
@@ -30,20 +26,21 @@ diff -Naur perl-5.18.2.orig/Configure perl-5.18.2/Configure
*) set dflt privlib lib/$version ;;
esac
eval $prefixit
-@@ -6467,6 +6469,8 @@
+@@ -6748,6 +6751,8 @@
case "$sitelib" in
'') case "$installstyle" in
*lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
-+ *lib32/perl5*) dflt=$siteprefix/lib32/$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
;;
-@@ -6986,6 +6990,8 @@
+@@ -7166,6 +7171,9 @@
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
commit 149f9af5fc857370cde9deaa6d2783639dcaab46
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Thu May 29 08:49:53 2014 -0500
Add command to multilib perl n32 and 64bit to properly set installstyle variable to use from the applied multilib patch.
diff --git a/BOOK/final-system/multilib/perl-64bit.xml b/BOOK/final-system/multilib/perl-64bit.xml
index cc9c3ad..79cfb9f 100644
--- a/BOOK/final-system/multilib/perl-64bit.xml
+++ b/BOOK/final-system/multilib/perl-64bit.xml
@@ -36,6 +36,11 @@
<screen os="mp2"><userinput>patch -Np1 -i ../&perl-multilib-patch;</userinput></screen>
+ <para os="m2">We still need to tell Perl to actually use
+ <filename class="directory">lib64</filename>:</para>
+
+<screen os="m3"><userinput>echo 'installstyle="lib64/perl5"' >> hints/linux.sh</userinput></screen>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/perl.xml"
xpointer="xpointer(//*[@os='a'])"/>
diff --git a/BOOK/final-system/multilib/perl-n32.xml b/BOOK/final-system/multilib/perl-n32.xml
index 4bc4d10..c7d2a68 100644
--- a/BOOK/final-system/multilib/perl-n32.xml
+++ b/BOOK/final-system/multilib/perl-n32.xml
@@ -39,6 +39,11 @@
href="perl-64bit.xml"
xpointer="xpointer(//*[@os='mp2'])"/>
+ <para os="m2">We still need to tell perl to actually use
+ <filename class="directory">lib32</filename>:</para>
+
+<screen os="m3"><userinput>echo 'installstyle="lib32/perl5"' >> hints/linux.sh</userinput></screen>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/perl.xml"
xpointer="xpointer(//*[@os='a'])"/>
commit 39bf018a911b01b82b65b7d7e49b19a9c94d958b
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Wed May 28 21:13:51 2014 -0500
Remove perl libc patch from common materials.
diff --git a/BOOK/materials/common/patches.xml b/BOOK/materials/common/patches.xml
index 02211f1..72886bd 100644
--- a/BOOK/materials/common/patches.xml
+++ b/BOOK/materials/common/patches.xml
@@ -120,15 +120,6 @@
</varlistentry>
<varlistentry>
- <term>Perl Libc Patch - <token>&perl-libc-patch-size;</token>:</term>
- <listitem>
- <para>Download: <ulink
- url="&patches-root;&perl-libc-patch;"/></para>
- <para>MD5 sum: <literal>&perl-libc-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>Readline Branch Update - <token>&readline-branch_update-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink
commit d57a1c5f3f079f8028db766873095da315beb8ed
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Wed May 28 21:12:07 2014 -0500
Add master change log entry for Perl 5.20.0 upgrade.
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 874653e..d5d0eb8 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -40,6 +40,9 @@
<para>29 May 2014</para>
<itemizedlist>
<listitem>
+ <para>[William Harrington] - Update Perl to 5.20.0.</para>
+ </listitem>
+ <listitem>
<para>[Chris] - Edited "how" page - removed details about
booting/chrooting and moved them to the "choose" page for temp-system.</para>
</listitem>
commit c463a878dc134b57ac06193aac1e5873aa4baf87
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Wed May 28 21:11:36 2014 -0500
Update perl version, size, and md5-hash.
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index a2f0422..6d24098 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -342,10 +342,10 @@
<!ENTITY patch-md5 "e9ae5393426d3ad783a300a338c09b72">
<!ENTITY patch-home "http://savannah.gnu.org/projects/patch">
-<!ENTITY perl-version "5.18.2">
-<!ENTITY perl-size "14,059 KB">
+<!ENTITY perl-version "5.20.0">
+<!ENTITY perl-size "13,770 KB">
<!ENTITY perl-url "http://www.cpan.org/src/5.0/perl-&perl-version;.tar.bz2">
-<!ENTITY perl-md5 "d549b16ee4e9210988da39193a9389c1">
+<!ENTITY perl-md5 "20cbecd4e9e880ee7a50a136c8b1484e">
<!ENTITY perl-home "http://www.perl.org">
<!ENTITY pkg-config-lite-version "0.28-1">
commit 00e1ebc015cdfdd32bf5ad19e4381402527c6bd9
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Wed May 28 21:10:54 2014 -0500
Remove perl libc patch and update Perl multilib patch size and md5 hash.
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index e119345..839c98a 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -56,10 +56,6 @@
<!ENTITY ncurses-branch_update-patch-md5 "c2b2dc2d31b02c218359e6218f12a72c">
<!ENTITY ncurses-branch_update-patch-size "2,492 KB">
-<!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
-<!ENTITY perl-libc-patch-md5 "0959d8c1d370ce152b0d2a6df5ccfd7e">
-<!ENTITY perl-libc-patch-size "1.657 KB">
-
<!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-3.patch">
<!ENTITY readline-branch_update-patch-md5 "db39169d31ee08517e69d5eaec2c61c6">
<!ENTITY readline-branch_update-patch-size "4.182 KB">
@@ -85,8 +81,8 @@
<!ENTITY iproute2-libdir-patch-size "1.990 KB">
<!ENTITY perl-multilib-patch "perl-&perl-version;-Configure_multilib-1.patch">
-<!ENTITY perl-multilib-patch-md5 "5b79ffc5337193d4f725d4bfd3c60997">
-<!ENTITY perl-multilib-patch-size "2.000 KB">
+<!ENTITY perl-multilib-patch-md5 "x6c1df5fac5c88f9a79963a19e6f8bc02">
+<!ENTITY perl-multilib-patch-size "2.055 KB">
<!-- Start of Pure64 patches -->
commit c3366527955bb75fb0865abbbda5e373ad4b9aa0
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Wed May 28 21:10:06 2014 -0500
Seds for lib32 and li64 path are no longer used in hints. The scripts use plibpth now and are rewwritten.
diff --git a/BOOK/final-system/multilib/perl-64bit.xml b/BOOK/final-system/multilib/perl-64bit.xml
index 2402e2c..cc9c3ad 100644
--- a/BOOK/final-system/multilib/perl-64bit.xml
+++ b/BOOK/final-system/multilib/perl-64bit.xml
@@ -36,18 +36,6 @@
<screen os="mp2"><userinput>patch -Np1 -i ../&perl-multilib-patch;</userinput></screen>
- <para os="s1">There is a further (possibly cosmetic) anomaly - if we
- install Perl and then run <command>perl -V</command> it will claim that
- libc is in <filename class="directory">/lib</filename>. The
- following sed fixes this, but only takes effect when
- <command>make install</command> is run:</para>
-
-<screen os="s2"><userinput>sed -i "/libc/s@/lib@/lib64@" hints/linux.sh</userinput></screen>
-
- <para os="m2">We still need to tell Perl to actually use <filename class="directory">lib64</filename>:</para>
-
-<screen os="m3"><userinput>echo 'installstyle="lib64/perl5"' >> hints/linux.sh</userinput></screen>
-
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/perl.xml"
xpointer="xpointer(//*[@os='a'])"/>
diff --git a/BOOK/final-system/multilib/perl-n32.xml b/BOOK/final-system/multilib/perl-n32.xml
index 605191c..4bc4d10 100644
--- a/BOOK/final-system/multilib/perl-n32.xml
+++ b/BOOK/final-system/multilib/perl-n32.xml
@@ -40,16 +40,6 @@
xpointer="xpointer(//*[@os='mp2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="perl-64bit.xml"
- xpointer="xpointer(//*[@os='s1'])"/>
-
-<screen os="s2"><userinput>sed -i "/libc/s@/lib@/lib32@" hints/linux.sh</userinput></screen>
-
- <para os="m2">We still need to tell perl to actually use lib32:</para>
-
-<screen os="m3"><userinput>echo 'installstyle="lib32/perl5"' >> hints/linux.sh</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/perl.xml"
xpointer="xpointer(//*[@os='a'])"/>
commit 5433fa6f0dfb9542e9abdc8f30f75460abedc95f
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Wed May 28 21:08:47 2014 -0500
Remove Perl libc patch as it is needed no longer, since nothing is hardcoded for libc. Script has been redone and uses plibpth.
diff --git a/BOOK/final-system/common/temp-perl.xml b/BOOK/final-system/common/temp-perl.xml
index 36397e3..1e6a144 100644
--- a/BOOK/final-system/common/temp-perl.xml
+++ b/BOOK/final-system/common/temp-perl.xml
@@ -22,11 +22,6 @@
<sect2 role="installation">
<title>Installation of Perl</title>
- <para os="a">First adapt some hard-wired paths to the C library by applying
- the following patch:</para>
-
-<screen os="b"><userinput>patch -Np1 -i ../&perl-libc-patch;</userinput></screen>
-
<para os="s1">Change a hardcoded path from
<filename class="directory">/usr/include</filename> to
<filename class="directory">/tools/include</filename>:</para>
diff --git a/BOOK/final-system/multilib/temp-perl.xml b/BOOK/final-system/multilib/temp-perl.xml
index 4dce6b1..78c1e86 100644
--- a/BOOK/final-system/multilib/temp-perl.xml
+++ b/BOOK/final-system/multilib/temp-perl.xml
@@ -24,14 +24,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/temp-perl.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/temp-perl.xml"
- xpointer="xpointer(//*[@os='b'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/temp-perl.xml"
xpointer="xpointer(//*[@os='s1'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/materials/mips64/patches.xml b/BOOK/materials/mips64/patches.xml
index 52a1c1a..18e3a95 100644
--- a/BOOK/materials/mips64/patches.xml
+++ b/BOOK/materials/mips64/patches.xml
@@ -36,10 +36,6 @@
href="../x86_64/patches.xml"
xpointer="xpointer(//*[@os='iproute2-libdir-patch'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64/patches.xml"
- xpointer="xpointer(//*[@os='perl-multilib-patch'])"/>
-
</variablelist>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/materials/ppc64/patches.xml b/BOOK/materials/ppc64/patches.xml
index 9cf1d08..086e102 100644
--- a/BOOK/materials/ppc64/patches.xml
+++ b/BOOK/materials/ppc64/patches.xml
@@ -25,10 +25,6 @@
xpointer="xpointer(//*[@os='iproute2-libdir-patch'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64/patches.xml"
- xpointer="xpointer(//*[@os='perl-multilib-patch'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../ppc/patches.xml"
xpointer="xpointer(//*[@os='powerpcutils-fixes-patch'])"/>
diff --git a/BOOK/materials/sparc64/patches.xml b/BOOK/materials/sparc64/patches.xml
index 847ed55..17e5fe2 100644
--- a/BOOK/materials/sparc64/patches.xml
+++ b/BOOK/materials/sparc64/patches.xml
@@ -25,10 +25,6 @@
xpointer="xpointer(//*[@os='iproute2-libdir-patch'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64/patches.xml"
- xpointer="xpointer(//*[@os='perl-multilib-patch'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../sparc/patches.xml"
xpointer="xpointer(//*[@os='silo-fixes-patch'])"/>
diff --git a/BOOK/materials/x86_64/patches.xml b/BOOK/materials/x86_64/patches.xml
index 67986cd..1ffc577 100644
--- a/BOOK/materials/x86_64/patches.xml
+++ b/BOOK/materials/x86_64/patches.xml
@@ -25,15 +25,6 @@
</listitem>
</varlistentry>
- <varlistentry os="perl-multilib-patch">
- <term>Perl Configure Multilib Patch - <token>&perl-multilib-patch-size;</token>:</term>
- <listitem>
- <para>Download: <ulink
- url="&patches-root;&perl-multilib-patch;"/></para>
- <para>MD5 sum: <literal>&perl-multilib-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
</variablelist>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
commit 10496d38a38841d7762170b1258b7b45b7c989f2
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Wed May 28 21:06:01 2014 -0500
Rename Perl Configure Multilib patch for 5.20.0 from 5.18.2.
diff --git a/patches/perl-5.18.2-libc-1.patch b/patches/perl-5.18.2-libc-1.patch
deleted file mode 100644
index 23b6de1..0000000
--- a/patches/perl-5.18.2-libc-1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Submitted By: Jonathan Norman <Jonathan at bluesquarelinux.co.uk>
-Date: 2013-08-13
-Initial Package Version: 5.8.8
-Origin: Ryan Oliver
-Upstream Status: Unknown
-Description: This patch adapts some hard-wired paths to the C library.
- It uses the $prefix variable to locate the correct libc.
-
-Rediffed: Against 5.10.0 by Joe Ciccone on 2008-08-30
- Against 5.10.1 By Jim Gifford on 2009-08-25
- 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
-
-Rediffed: Against 5.18.0 by William Harrington on 2013-05-27
-Rediffed: Against 5.18.1 by William Harrington on 2013-08-13
-Rediffed: Against 5.18.2 by Chris Staub on 2014-01-10
-
-diff -Naur perl-5.18.2.orig/hints/linux.sh perl-5.18.2/hints/linux.sh
---- perl-5.18.2.orig/hints/linux.sh 2014-01-06 17:46:45.000000000 -0500
-+++ perl-5.18.2/hints/linux.sh 2014-01-10 02:34:36.000000000 -0500
-@@ -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 /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,3 +456,9 @@
- libswanted="$libswanted pthread"
- ;;
- esac
-+
-+locincpth=""
-+loclibpth=""
-+glibpth="${prefix}/lib"
-+usrinc="${prefix}/include"
-+
diff --git a/patches/perl-5.18.2-Configure_multilib-1.patch b/patches/perl-5.20.0-Configure_multilib-1.patch
similarity index 97%
rename from patches/perl-5.18.2-Configure_multilib-1.patch
rename to patches/perl-5.20.0-Configure_multilib-1.patch
index 1bcb00f..9d9f384 100644
--- a/patches/perl-5.18.2-Configure_multilib-1.patch
+++ b/patches/perl-5.20.0-Configure_multilib-1.patch
@@ -16,6 +16,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
Rediffed: Against 5.18.2 by Chris Staub on 2014-01-10
+Rename for 5.20.0 by William Harrington on 2014-05-29
+
diff -Naur perl-5.18.2.orig/Configure perl-5.18.2/Configure
--- perl-5.18.2.orig/Configure 2014-01-06 17:46:42.000000000 -0500
+++ perl-5.18.2/Configure 2014-01-10 02:38:43.000000000 -0500
-----------------------------------------------------------------------
Summary of changes:
BOOK/temp-system/common/choose.xml | 52 +++++++++++++++++------------------
1 files changed, 25 insertions(+), 27 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list