r1981 - in profiles/LFS/branches/gcc4: chapter05 chapter06 config scripts

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Wed Aug 31 11:47:06 PDT 2005


Author: thomasp
Date: 2005-08-31 12:47:05 -0600 (Wed, 31 Aug 2005)
New Revision: 1981

Modified:
   profiles/LFS/branches/gcc4/chapter05/gcc-pass2.xml
   profiles/LFS/branches/gcc4/chapter06/util-linux.xml
   profiles/LFS/branches/gcc4/config/package.ent
   profiles/LFS/branches/gcc4/scripts/required.packages.urls
Log:
apply patch from Filip Bartmann to incorporate recent changes to gcc4 branch

Modified: profiles/LFS/branches/gcc4/chapter05/gcc-pass2.xml
===================================================================
--- profiles/LFS/branches/gcc4/chapter05/gcc-pass2.xml	2005-08-31 01:36:04 UTC (rev 1980)
+++ profiles/LFS/branches/gcc4/chapter05/gcc-pass2.xml	2005-08-31 18:47:05 UTC (rev 1981)
@@ -20,6 +20,12 @@
         <name>gcc-build</name>
       </mkdir>
     </stage>
+      <!-- Run the following command:  expect -c "spawn ls"
+If you receive the message:
+        The system has no more ptys.  Ask your system administrator to create more.
+Your host distribution is not set up for proper PTY operation. In this case there is no point in running the test
+suites for GCC and Binutils until you are able to resolve the issue.
+      -->
     <stage name="Patching">
       <stageinfo>
         <environment>
@@ -28,36 +34,28 @@
         </environment>
         <base>&build_dir;/&gcc-directory;</base>
       </stageinfo>
-      <!-- Run the following command:  expect -c "spawn ls"
-If you receive the message:
-        The system has no more ptys.  Ask your system administrator to create more.
-Your host distribution is not set up for proper PTY operation. In this case there is no point in running the test
-suites for GCC and Binutils until you are able to resolve the issue.
-      -->
+      <copy>
+       <source>gcc/Makefile.in</source>
+       <destination>gcc/Makefile.in.orig</destination>
+      </copy>
       <execute command="sed">
-        <param>-i</param>
         <param>'s@\(^NATIVE_SYSTEM_HEADER_DIR =\).*@\1 /tools/include at g'</param>
-        <param>gcc/Makefile.in</param>
+        <param>gcc/Makefile.in.orig > gcc/Makefile.in</param>
       </execute>
-<!--
-      <patch base="&build_dir;/&gcc-directory;">
-        <param>-N</param>
-        <param>-p1</param>
-        <param>-i &packages_dir;/&gcc-no-fixincludes-patch;</param>
-      </patch>
--->
+      <copy>
+	<source>gcc/Makefile.in</source>
+	<destination>gcc/Makefile.in.tmp</destination>
+      </copy>
+      <execute command="sed">
+        <param>'s/^XCFLAGS =$/&real-amp; -fomit-frame-pointer/'</param>
+        <param>gcc/Makefile.in.tmp > gcc/Makefile.in</param>
+      </execute>
       <patch>
         <param>-N</param>
         <param>-p1</param>
         <param>-i &packages_dir;/&gcc-specs-patch;</param>
       </patch>
-      <execute command="sed">
-        <param>-i</param>
-        <param>'/^XCFLAGS/s/$/ -fomit-frame-pointer/'</param>
-        <param>gcc/Makefile.in</param>
-      </execute>
     </stage>
-
     <stage name="Installing">
       <stageinfo>
         <environment>

Modified: profiles/LFS/branches/gcc4/chapter06/util-linux.xml
===================================================================
--- profiles/LFS/branches/gcc4/chapter06/util-linux.xml	2005-08-31 01:36:04 UTC (rev 1980)
+++ profiles/LFS/branches/gcc4/chapter06/util-linux.xml	2005-08-31 18:47:05 UTC (rev 1981)
@@ -34,6 +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>
       <configure />
       <make>
         <param>&jlevel;</param>

Modified: profiles/LFS/branches/gcc4/config/package.ent
===================================================================
--- profiles/LFS/branches/gcc4/config/package.ent	2005-08-31 01:36:04 UTC (rev 1980)
+++ profiles/LFS/branches/gcc4/config/package.ent	2005-08-31 18:47:05 UTC (rev 1981)
@@ -156,7 +156,7 @@
 <!ENTITY inetutils-directory "inetutils-&inetutils-version;">
 
 <!ENTITY inetutils-no-man-pages-patch "inetutils-&inetutils-version;-no_server_man_pages-1.patch">
-<!ENTITY inetutils-gcc4_fixes-patch "inetutils-&inetutils-version;-gcc4_fixes-1.patch">
+<!ENTITY inetutils-gcc4_fixes-patch "inetutils-&inetutils-version;-gcc4_fixes-3.patch">
 
 <!ENTITY iproute2-md5 "f455fce014fefefe26c05f9b9479440c">
 <!ENTITY iproute2-version "2.6.11">

Modified: profiles/LFS/branches/gcc4/scripts/required.packages.urls
===================================================================
--- profiles/LFS/branches/gcc4/scripts/required.packages.urls	2005-08-31 01:36:04 UTC (rev 1980)
+++ profiles/LFS/branches/gcc4/scripts/required.packages.urls	2005-08-31 18:47:05 UTC (rev 1981)
@@ -84,5 +84,5 @@
 http://www.linuxfromscratch.org/patches/lfs/gcc4/glibc-2.3.5-gcc4_fix_elf-1.patch
 http://www.linuxfromscratch.org/patches/lfs/gcc4/glibc-2.3.5-gcc4_fix_iconvdata-1.patch
 http://www.linuxfromscratch.org/patches/lfs/gcc4/kbd-1.12-gcc4_fixes-1.patch
-http://www.linuxfromscratch.org/patches/lfs/gcc4/inetutils-1.4.2-gcc4_fixes-1.patch
+http://www.linuxfromscratch.org/patches/lfs/gcc4/inetutils-1.4.2-gcc4_fixes-3.patch
 http://www.linuxfromscratch.org/patches/lfs/gcc4/tar-1.15.1-gcc4_fix_tests-1.patch




More information about the alfs-log mailing list