r1569 - branches/Onward/temporary_system

robert at linuxfromscratch.org robert at linuxfromscratch.org
Tue Feb 23 10:13:02 PST 2010


Author: robert
Date: 2010-02-23 11:13:01 -0700 (Tue, 23 Feb 2010)
New Revision: 1569

Modified:
   branches/Onward/temporary_system/bash.txt
   branches/Onward/temporary_system/bison.txt
   branches/Onward/temporary_system/coreutils.txt
   branches/Onward/temporary_system/dejagnu.txt
   branches/Onward/temporary_system/expect.txt
   branches/Onward/temporary_system/grep.txt
   branches/Onward/temporary_system/index.txt
   branches/Onward/temporary_system/make.txt
   branches/Onward/temporary_system/perl.txt
   branches/Onward/temporary_system/udev.txt
   branches/Onward/temporary_system/util-linux-ng.txt
Log:
Move Sed up in the build order, and use the sed -i option with other packages.

Modified: branches/Onward/temporary_system/bash.txt
===================================================================
--- branches/Onward/temporary_system/bash.txt	2010-02-23 10:06:33 UTC (rev 1568)
+++ branches/Onward/temporary_system/bash.txt	2010-02-23 18:13:01 UTC (rev 1569)
@@ -21,10 +21,10 @@
 # Bash uses the RTLD_LAZY option when loading libraries. Modify Bash to use
 # RTLD_NOW (defined from <dlfcn.h>) instead:
 
-cp -v builtins/enable.def{,.orig} &&
-sed 's/filename, RTLD_LAZY/filename, RTLD_NOW/' \
-	builtins/enable.def.orig > builtins/enable.def &&
+sed 's/filename, RTLD_LAZY/filename, RTLD_NOW/' -i builtins/enable.def &&
 
+# Configure and build Bash:
+
 mkdir -v obj/ &&
 cd obj/ &&
 ../configure --prefix=/tools --without-bash-malloc \
@@ -33,6 +33,8 @@
 # --without-bash-malloc makes Bash use the malloc(3) function from Glibc
 # instead of a built-in version.
 
+# Install Bash:
+
 make &&
 make install &&
 ln -vfs bash /tools/bin/sh

Modified: branches/Onward/temporary_system/bison.txt
===================================================================
--- branches/Onward/temporary_system/bison.txt	2010-02-23 10:06:33 UTC (rev 1568)
+++ branches/Onward/temporary_system/bison.txt	2010-02-23 18:13:01 UTC (rev 1569)
@@ -1,5 +1,7 @@
 # Temporary tools - Bison
 
+# Configure, build, and install Bison:
+
 mkdir -v obj/ &&
 cd obj/ &&
 ../configure --prefix=/tools \

Modified: branches/Onward/temporary_system/coreutils.txt
===================================================================
--- branches/Onward/temporary_system/coreutils.txt	2010-02-23 10:06:33 UTC (rev 1568)
+++ branches/Onward/temporary_system/coreutils.txt	2010-02-23 18:13:01 UTC (rev 1569)
@@ -1,13 +1,12 @@
 # Temporary tools - Coreutils
 
-# Configure and build Coreutils:
+# Configure, build, and install Coreutils:
+
 mkdir -v obj/ &&
 cd obj/ &&
 ../configure --prefix=/tools --enable-install-program=hostname \
 	--infodir=$(pwd)/DESTDIR --mandir=$(pwd)/DESTDIR &&
 make &&
-
-# Install Coreutils
 make install &&
 
 # We need the su program in the final system to run test suites:

Modified: branches/Onward/temporary_system/dejagnu.txt
===================================================================
--- branches/Onward/temporary_system/dejagnu.txt	2010-02-23 10:06:33 UTC (rev 1568)
+++ branches/Onward/temporary_system/dejagnu.txt	2010-02-23 18:13:01 UTC (rev 1569)
@@ -1,5 +1,7 @@
 # Temporary tools - DejaGNU
 
+# Configure, build, and install DejaGNU:
+
 mkdir -v obj/ &&
 cd obj/ &&
 ../configure --prefix=/tools \

Modified: branches/Onward/temporary_system/expect.txt
===================================================================
--- branches/Onward/temporary_system/expect.txt	2010-02-23 10:06:33 UTC (rev 1568)
+++ branches/Onward/temporary_system/expect.txt	2010-02-23 18:13:01 UTC (rev 1569)
@@ -1,11 +1,17 @@
 # Temporary tools - Expect
 
+# Patch Expect with various fixes:
+
 patch -p1 -i ../expect-5.43.0-spawn-1.patch &&
 patch -p1 -i ../expect-5.43.0-tcl_8.5.4_fix-1.patch &&
 
-cp -v configure{,.orig} &&
-sed 's:/usr/local/bin:/bin:' configure.orig > configure &&
+# Modify Expect to use /bin/stty instead of a /usr/local/bin/stty on the host
+# system:
 
+sed 's:/usr/local/bin:/bin:' -i configure &&
+
+# Configure, build, and install Expect:
+
 mkdir -v obj/ &&
 cd obj/ &&
 ../configure --prefix=/tools --with-tcl=/tools/lib \

Modified: branches/Onward/temporary_system/grep.txt
===================================================================
--- branches/Onward/temporary_system/grep.txt	2010-02-23 10:06:33 UTC (rev 1568)
+++ branches/Onward/temporary_system/grep.txt	2010-02-23 18:13:01 UTC (rev 1569)
@@ -1,12 +1,9 @@
 # Temporary tools - Grep
 
+# Configure, build, and install Grep:
+
 mkdir -v obj/ &&
 cd obj/ &&
-
-# --without-included-regex makes Grep use libc for regex. This gets rid of
-# some compiler warnings. Grep doesn't detect regex in libc properly with
-# Glibc-2.8+.
-
 ../configure --prefix=/tools --disable-perl-regexp \
 	--without-included-regex \
 	--infodir=$(pwd)/DESTDIR --mandir=$(pwd)/DESTDIR &&

Modified: branches/Onward/temporary_system/index.txt
===================================================================
--- branches/Onward/temporary_system/index.txt	2010-02-23 10:06:33 UTC (rev 1568)
+++ branches/Onward/temporary_system/index.txt	2010-02-23 18:13:01 UTC (rev 1569)
@@ -10,6 +10,7 @@
 binutils_pass2.txt
 xz.txt
 tar.txt
+sed.txt
 ncurses.txt
 bash.txt
 bison.txt
@@ -33,7 +34,6 @@
 module-init-tools.txt
 patch.txt
 perl.txt
-sed.txt
 sysvinit.txt
 texinfo.txt
 udev.txt

Modified: branches/Onward/temporary_system/make.txt
===================================================================
--- branches/Onward/temporary_system/make.txt	2010-02-23 10:06:33 UTC (rev 1568)
+++ branches/Onward/temporary_system/make.txt	2010-02-23 18:13:01 UTC (rev 1569)
@@ -1,5 +1,7 @@
 # Temporary tools - Make
 
+# Configure, build, and install Make:
+
 mkdir -v obj/ &&
 cd obj/ &&
 ../configure --prefix=/tools \

Modified: branches/Onward/temporary_system/perl.txt
===================================================================
--- branches/Onward/temporary_system/perl.txt	2010-02-23 10:06:33 UTC (rev 1568)
+++ branches/Onward/temporary_system/perl.txt	2010-02-23 18:13:01 UTC (rev 1569)
@@ -2,19 +2,16 @@
 
 # Modify Perl to build 'DynaLoader.a' with -fPIC:
 
-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 &&
+	-i 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 &&
+	-i ext/Compress-Raw-Zlib/config.in &&
 
 # Configure and build Perl:
 

Modified: branches/Onward/temporary_system/udev.txt
===================================================================
--- branches/Onward/temporary_system/udev.txt	2010-02-23 10:06:33 UTC (rev 1568)
+++ branches/Onward/temporary_system/udev.txt	2010-02-23 18:13:01 UTC (rev 1569)
@@ -1,5 +1,7 @@
 # Temporary tools - Udev
 
+# Configure, build, and install Udev:
+
 mkdir -v obj/ &&
 cd obj/ &&
 ../configure --prefix=/tools --sbindir=/tools/bin \

Modified: branches/Onward/temporary_system/util-linux-ng.txt
===================================================================
--- branches/Onward/temporary_system/util-linux-ng.txt	2010-02-23 10:06:33 UTC (rev 1568)
+++ branches/Onward/temporary_system/util-linux-ng.txt	2010-02-23 18:13:01 UTC (rev 1569)
@@ -28,8 +28,7 @@
 # their theoretical vulnerabilities. In final, /dev/random is best, with an
 # RNGD.
 
-sed -i.orig 's@/dev/urandom@/dev/random@' \
-	./mount/swapon.c ./mount/lomount.c &&
+sed 's@/dev/urandom@/dev/random@' -i ./mount/swapon.c ./mount/lomount.c &&
 
 # Configure Util-linux-ng:
 




More information about the hlfs-book mailing list