r1563 - in branches/Onward: downloads temporary_system

robert at linuxfromscratch.org robert at linuxfromscratch.org
Tue Feb 23 00:44:20 PST 2010


Author: robert
Date: 2010-02-23 01:44:20 -0700 (Tue, 23 Feb 2010)
New Revision: 1563

Modified:
   branches/Onward/downloads/packages.txt
   branches/Onward/downloads/patches.txt
   branches/Onward/temporary_system/perl.txt
Log:
Bump to perl-5.10.1.

Modified: branches/Onward/downloads/packages.txt
===================================================================
--- branches/Onward/downloads/packages.txt	2010-02-22 22:45:30 UTC (rev 1562)
+++ branches/Onward/downloads/packages.txt	2010-02-23 08:44:20 UTC (rev 1563)
@@ -99,6 +99,9 @@
 # http://ftp.gnu.org/gnu/patch/patch-2.6.1.tar.xz.sig
 http://ftp.gnu.org/gnu/patch/patch-2.6.1.tar.xz
 
+# Perl:
+http://www.cpan.org/src/perl-5.10.1.tar.bz2
+
 # Sed:
 # http://ftp.gnu.org/gnu/sed/sed-4.1.5.tar.gz.sig
 http://ftp.gnu.org/gnu/sed/sed-4.1.5.tar.gz

Modified: branches/Onward/downloads/patches.txt
===================================================================
--- branches/Onward/downloads/patches.txt	2010-02-22 22:45:30 UTC (rev 1562)
+++ branches/Onward/downloads/patches.txt	2010-02-23 08:44:20 UTC (rev 1563)
@@ -100,9 +100,6 @@
 # Patch mkstemp() patch:
 http://www.linuxfromscratch.org/~robert/new/patches/patch-2.6.1-mkstemp.diff
 
-# Perl upstream fixes patch:
-http://www.linuxfromscratch.org/patches/downloads/perl/perl-5.10.0-consolidated-1.patch
-
 # Util-linux-ng Loop-AES patch:
 # http://loop-aes.sourceforge.net/updates/util-linux-ng-2.14.2-20090214.diff.bz2.sign
 http://loop-aes.sourceforge.net/updates/util-linux-ng-2.14.2-20090214.diff.bz2

Modified: branches/Onward/temporary_system/perl.txt
===================================================================
--- branches/Onward/temporary_system/perl.txt	2010-02-22 22:45:30 UTC (rev 1562)
+++ branches/Onward/temporary_system/perl.txt	2010-02-23 08:44:20 UTC (rev 1563)
@@ -1,9 +1,31 @@
 # Temporary tools - Perl
 
-# Upstream fixes:
+# Modify Perl to build 'DynaLoader.a' with -fPIC:
 
-patch -p1 -i ../perl-5.10.0-consolidated-1.patch &&
+mv -v Makefile.SH{,.orig} &&
+sed -e "s at pldlflags=''@pldlflags=\"\$cccdlflags\"@g" \
+	-e "s at static_target='static'@static_target='static_pic'@g" \
+	Makefile.SH.orig > Makefile.SH &&
 
+# Modify Perl to use the shared Zlib library in /tools:
+
+mv -v ext/Compress-Raw-Zlib/config.in{,.orig} &&
+sed -e '/^BUILD_ZLIB/ s/True/False/' \
+	-e '/^INCLUDE/s|\./zlib-src|/tools/include|' \
+	-e '/^LIB/s|\./zlib-src|/tools/lib|' \
+	ext/Compress-Raw-Zlib/config.in.orig \
+	> ext/Compress-Raw-Zlib/config.in &&
+
+# Configure and build Perl:
+
+mkdir -v obj/ &&
+cd obj/ &&
+../Configure -Dprefix=/tools -Dlibc=/tools/lib/libc.so.6 \
+	-Dglibpth="/tools/lib" -Dusrinc="/tools/include" \
+	-Dmksymlinks -Ulocincpth -Uloclibpth -Dman1dir=$(pwd)/DESTDIR/man1 \
+	-Dman3dir=$(pwd)/DESTDIR/man3 -d -e &&
+make &&
+
 # -Dlibc, locincpth, loclibpth, glibpth, and usrinc, are equivilent to the LFS
 # Perl libc patch.
 
@@ -12,20 +34,8 @@
 # sources. -d -e are added to accept all defaults, otherwise ./Configure will
 # be interactive.
 
-# One of the reasons we build all of Perl is because mini-perl (like LFS
-# installs) uses mktemp(3).
-
-mkdir -v obj/ &&
-cd obj/ &&
-../Configure -Dprefix=/tools -Dlibc=/tools/lib/libc-2.8.so \
-	-Ulocincpth -Uloclibpth -Dglibpth="/tools/lib" \
-	-Dusrinc="/tools/include" -Dmksymlinks -Dman1dir=$(pwd)/DESTDIR/man1 \
-	-Dman3dir=$(pwd)/DESTDIR/man3 -d -e &&
-
-make &&
-
 # Perl will want to install modules as symbolic links that point to the source
-# directory, so we set LNS to use the 'cp' command instead:
+# directory, so we set LNS to use the 'cp' command to install Perl:
 
 make LNS="cp" install
 




More information about the hlfs-book mailing list