In appendix is patch for ALFS-GCC4,in this patch is included changes
from my previous patch 20050902 too.
Filip Bartmann
diff -Naur gcc4/config/package.ent gcc4_ch/config/package.ent
--- gcc4/config/package.ent 2005-09-07 10:43:43.000000000 +0200
+++ gcc4_ch/config/package.ent 2005-09-07 12:21:57.000000000 +0200
@@ -72,8 +72,8 @@
<!ENTITY file-package "file-&file-version;.tar.bz2">
<!ENTITY file-directory "file-&file-version;">
-<!ENTITY findutils-md5 "e455be17179976af5f292251e911f213">
-<!ENTITY findutils-version "4.2.23">
+<!ENTITY findutils-md5 "69af4014310c0b25004c88961d1d06f1">
+<!ENTITY findutils-version "4.2.25">
<!ENTITY findutils-package "findutils-&findutils-version;.tar.bz2">
<!ENTITY findutils-directory "findutils-&findutils-version;">
@@ -117,6 +117,7 @@
<!ENTITY glibc-gcc4_string-patch "glibc-&glibc-version;&glibc-cvs-tag;-gcc4_fix_string-1.patch">
<!ENTITY glibc-gcc4_elf-patch "glibc-&glibc-version;&glibc-cvs-tag;-gcc4_fix_elf-1.patch">
<!ENTITY glibc-gcc4_iconvdata-patch "glibc-&glibc-version;&glibc-cvs-tag;-gcc4_fix_iconvdata-1.patch">
+<!ENTITY glibc-gcc4_mathtest-patch "glibc-&glibc-version;&glibc-cvs-tag;-gcc4_fix_math_tests-1.patch">
<!ENTITY grep-md5 "52202fe462770fa6be1bb667bd6cf30c">
<!ENTITY grep-version "2.5.1a">
@@ -181,8 +182,8 @@
<!ENTITY lfs-bootscripts-package "lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
<!ENTITY lfs-bootscripts-directory "lfs-bootscripts-&lfs-bootscripts-version;">
-<!ENTITY libtool-md5 "703d55f1778a18f0b3840c2af323f0d8">
-<!ENTITY libtool-version "1.5.18">
+<!ENTITY libtool-md5 "3e96475575296ae7709259786bc4c239">
+<!ENTITY libtool-version "1.5.20">
<!ENTITY libtool-package "libtool-&libtool-version;.tar.bz2">
<!ENTITY libtool-directory "libtool-&libtool-version;">
@@ -327,6 +328,7 @@
<!ENTITY util-linux-directory "util-linux-&util-linux-version;">
<!ENTITY util-linux-cramfs-patch "util-linux-&util-linux-version;-cramfs-1.patch">
+<!ENTITY util-linux-reiser-patch "util-linux-&util-linux-version;reiser_crash-2.patch">
<!ENTITY vim-md5 "821fda8f14d674346b87e3ef9cb96389">
<!ENTITY vim-version "6.3">
diff -Naur gcc4/chapter05/adjustingtoolchain.xml gcc4_ch/chapter05/adjustingtoolchain.xml
--- gcc4/chapter05/adjustingtoolchain.xml 2005-09-07 10:43:44.000000000 +0200
+++ gcc4_ch/chapter05/adjustingtoolchain.xml 2005-09-07 10:48:08.000000000 +0200
@@ -26,13 +26,17 @@
<param>`dirname $(gcc -print-libgcc-file-name)`/specs</param>
</execute>
<execute command="sed">
- <param>-i -e '[EMAIL PROTECTED]/lib/ld-linux.so.2@/tools&@g'</param>
- <param>`dirname $(gcc -print-libgcc-file-name)`/specs</param>
+ <param>'[EMAIL PROTECTED]/lib/ld-linux.so.2@/tools&@g'</param>
+ <param>`dirname $(gcc -print-libgcc-file-name)`/specs > tempspecfile </param>
+ </execute>
+ <execute command="mv">
+ <param>-f</param>
+ <param>tempspecfile</param>
+ <param>`dirname $(gcc -print-libgcc-file-name)`/specs</param>
</execute>
<execute command="find">
- <param>$(gcc -print-search-dirs | head -n 1 | awk '{ print $2 "include" }')/*</param>
- <param>-xtype d -exec rm -rf \{} \;</param>
- <param>|| true</param>
+ <param>`dirname $(gcc -print-libgcc-file-name)`/include</param>
+ <param>-maxdepth 0 -xtype d -exec rm -rf '{}' \;</param>
</execute>
<execute command="rm">
diff -Naur gcc4/chapter05/gcc-pass2.xml gcc4_ch/chapter05/gcc-pass2.xml
--- gcc4/chapter05/gcc-pass2.xml 2005-09-07 10:43:44.000000000 +0200
+++ gcc4_ch/chapter05/gcc-pass2.xml 2005-09-07 10:48:08.000000000 +0200
@@ -40,7 +40,7 @@
</copy>
<execute command="sed">
<param>'[EMAIL PROTECTED](^NATIVE_SYSTEM_HEADER_DIR =\)[EMAIL PROTECTED] /tools/[EMAIL PROTECTED]'</param>
- <param>gcc/Makefile.in.orig > gcc/Makefile.in</param>
+ <param>gcc/Makefile.in.orig > gcc/Makefile.in</param>
</execute>
<copy>
<source>gcc/Makefile.in</source>
@@ -48,7 +48,7 @@
</copy>
<execute command="sed">
<param>'s/^XCFLAGS =$/&real-amp; -fomit-frame-pointer/'</param>
- <param>gcc/Makefile.in.tmp > gcc/Makefile.in</param>
+ <param>gcc/Makefile.in.tmp > gcc/Makefile.in</param>
</execute>
<patch>
<param>-N</param>
diff -Naur gcc4/chapter06/glibc.xml gcc4_ch/chapter06/glibc.xml
--- gcc4/chapter06/glibc.xml 2005-09-07 10:43:45.000000000 +0200
+++ gcc4_ch/chapter06/glibc.xml 2005-09-07 12:23:46.000000000 +0200
@@ -60,6 +60,12 @@
<param>-i &packages_dir;/&glibc-gcc4_iconvdata-patch;</param>
</patch>
+ <patch>
+ <param>-N</param>
+ <param>-p1</param>
+ <param>-i &packages_dir;/&glibc-gcc4_mathtest-patch;</param>
+ </patch>
+
</stage>
<stage name="Installing">
<stageinfo>
@@ -80,15 +86,10 @@
<prefix>PARALLELMFLAGS=&jlevel;</prefix>
</make>
<make>
-<!-- <param>-k</param>
- we expect 4 failurs -->
- <param>check</param>
- <param> || make check</param>
- <param> || make check</param>
- <param> || make check</param>
- <param> || make check</param>
-<!-- Anything more than the expected 4 errors stops the build -->
+ <param>-k check >glibc-check-log 2>&1</param>
</make>
+ <execute command="grep Error glibc-check-log">
+ </execute>
<execute command="touch">
<param>/etc/ld.so.conf</param>
</execute>
diff -Naur gcc4/chapter06/libtool.xml gcc4_ch/chapter06/libtool.xml
--- gcc4/chapter06/libtool.xml 2005-09-07 10:43:45.000000000 +0200
+++ gcc4_ch/chapter06/libtool.xml 2005-09-07 11:50:04.000000000 +0200
@@ -34,10 +34,6 @@
<make>
<param>install</param>
</make>
- <ownership user="root" group="root">
- <option>recursive</option>
- <name>/usr/share/libtool/libltdl</name>
- </ownership>
</stage>
<stage name="Cleanup">
<remove>&build_dir;/&libtool-directory;</remove>
diff -Naur gcc4/chapter06/readjustingtoolchain.xml gcc4_ch/chapter06/readjustingtoolchain.xml
--- gcc4/chapter06/readjustingtoolchain.xml 2005-09-07 10:43:45.000000000 +0200
+++ gcc4_ch/chapter06/readjustingtoolchain.xml 2005-09-07 10:48:08.000000000 +0200
@@ -28,7 +28,7 @@
</execute>
<execute command="sed">
- <param>-i -e '[EMAIL PROTECTED]/tools/lib/ld-linux.so.2@/lib/[EMAIL PROTECTED]'</param>
+ <param>-i '[EMAIL PROTECTED]/tools/lib/ld-linux.so.2@/lib/[EMAIL PROTECTED]'</param>
<param>`dirname $(gcc -print-libgcc-file-name)`/specs</param>
</execute>
diff -Naur gcc4/chapter06/util-linux.xml gcc4_ch/chapter06/util-linux.xml
--- gcc4/chapter06/util-linux.xml 2005-09-07 10:43:45.000000000 +0200
+++ gcc4_ch/chapter06/util-linux.xml 2005-09-07 11:58:12.000000000 +0200
@@ -34,11 +34,11 @@
<param>-p1</param>
<param>-i &packages_dir;/&util-linux-cramfs-patch;</param>
</patch>
- <search_replace>
- <file>MCONFIG</file>
- <find>-O2</find>
- <replace>-O</replace>
- </search_replace>
+ <patch>
+ <param>-N</param>
+ <param>-p1</param>
+ <param>-i &packages_dir;/&util-linux-reiser-patch;</param>
+ </patch>
<configure />
<make>
<param>&jlevel;</param>
diff -Naur gcc4/scripts/required.packages.urls gcc4_ch/scripts/required.packages.urls
--- gcc4/scripts/required.packages.urls 2005-09-07 10:43:43.000000000 +0200
+++ gcc4_ch/scripts/required.packages.urls 2005-09-07 12:21:08.000000000 +0200
@@ -11,7 +11,7 @@
ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/e2fsprogs/e2fsprogs-1.38.tar.bz2
ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/expect/expect-5.43.0.tar.bz2
ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/file/file-4.15.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/findutils/findutils-4.2.23.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/findutils/findutils-4.2.25.tar.bz2
ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/flex/flex-2.5.31.tar.bz2
ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/gawk/gawk-3.1.4.tar.bz2
ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/gcc/gcc-4.0.1.tar.bz2
@@ -29,7 +29,7 @@
ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/kbd/kbd-1.12.tar.bz2
ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/less/less-382.tar.bz2
ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/lfs-bootscripts/lfs-bootscripts-3.2.1.tar.bz2
-ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/libtool/libtool-1.5.18.tar.bz2
+ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/libtool/libtool-1.5.20.tar.bz2
ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/linux/linux-2.6.12.5.tar.bz2
ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/linux-libc-headers/linux-libc-headers-2.6.12.0.tar.bz2
ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/m4/m4-1.4.3.tar.bz2
@@ -68,6 +68,7 @@
http://www.linuxfromscratch.org/patches/lfs/development/expect-5.43.0-spawn-1.patch
http://www.linuxfromscratch.org/patches/lfs/development/flex-2.5.31-debian_fixes-3.patch
http://www.linuxfromscratch.org/patches/lfs/development/glibc-2.3.5-fix_test-1.patch
+http://www.linuxfromscratch.org/patches/lfs/development/glibc-2.3.5-gcc4_fix_math_tests-1.patch
http://www.linuxfromscratch.org/patches/lfs/development/gzip-1.3.5-security_fixes-1.patch
http://www.linuxfromscratch.org/patches/lfs/development/inetutils-1.4.2-no_server_man_pages-1.patch
http://www.linuxfromscratch.org/patches/lfs/development/mktemp-1.5-add_tempfile-3.patch
@@ -76,6 +77,7 @@
http://www.linuxfromscratch.org/patches/lfs/development/sysklogd-1.4.1-fixes-1.patch
http://www.linuxfromscratch.org/patches/lfs/development/tar-1.15.1-sparse_fix-1.patch
http://www.linuxfromscratch.org/patches/lfs/development/util-linux-2.12q-cramfs-1.patch
+http://www.linuxfromscratch.org/patches/lfs/development/util-linux-2.12q-reiser_crash-2.patch
http://www.linuxfromscratch.org/patches/lfs/development/vim-6.3-security_fix-2.patch
http://www.linuxfromscratch.org/patches/lfs/gcc4/gcc-4.0.1-specs-1.patch
--
http://linuxfromscratch.org/mailman/listinfo/alfs-discuss
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
