提交: 0396be28581b1c7764226276cff6540caff38804 - LFScripts (git)

Commit MetaInfo

• 修訂: 0396be28581b1c7764226276cff6540caff38804 (tree)
• 時間: 2012-03-29 23:33:50
• 作者: matsuand <matsuand@user...>
• Commiter: matsuand

Log Message

[LFS] SVN-20120328, chapter 5.

Change Summary

• modified: LFS/5.04.sh
• modified: LFS/5.05.sh
• modified: LFS/5.06.sh
• modified: LFS/5.07.sh
• modified: LFS/5.09.sh
• modified: LFS/5.10.sh

差異

--- a/LFS/5.04.sh
+++ b/LFS/5.04.sh
@@ -26,13 +26,19 @@ START=`date +'%Y/%m/%d %H:%M:%S.%N'`
 
 cd $TARGETDIR
 
+echo \ \ Patching...
+patch -Np1 -i $DLD/binutils-2.22-build_fix-1.patch \
+	1> $LOG/$CHAP.$TARGET.0_patch.log 2>&1 || exit 1
+
 mkdir -v ../binutils-build
 cd ../binutils-build
 
 echo \ \ Configuring...
 ../binutils-$VER/configure \
-    --target=$LFS_TGT --prefix=/tools \
-    --disable-nls --disable-werror \
+    --target=$LFS_TGT \
+    --prefix=/tools   \
+    --disable-nls     \
+    --disable-werror  \
 	1> $LOG/$CHAP.$TARGET.1_conf.log 2>&1 || exit 1
 
 echo \ \ Making...

--- a/LFS/5.05.sh
+++ b/LFS/5.05.sh
@@ -3,7 +3,7 @@
 THISFILE=`basename $0`
 CHAP=`echo $THISFILE | sed s/\.sh//`
 
-VER=4.6.3
+VER=4.7.0
 TARGET=gcc-$VER
 TARGETBALL=$TARGET.tar.bz2
 TARGETDIR=$TARGET
@@ -38,29 +38,25 @@ mv -v mpc-$VER_mpc mpc
 
 START=`date +'%Y/%m/%d %H:%M:%S.%N'`
 
-#echo \ \ Patching...
-#patch -Np1 -i $DLD/gcc-$VER-cross_compile-1.patch \
-#	1> $LOG/$CHAP.$TARGET.0_patch.log 2>&1 || exit 1
-
 mkdir -v ../gcc-build
 cd ../gcc-build
 
 echo \ \ Configuring...
-../gcc-$VER/configure \
-    --target=$LFS_TGT \
-    --prefix=/tools \
-    --disable-nls \
-    --disable-shared \
-    --disable-multilib \
-    --disable-decimal-float \
-    --disable-threads \
-    --disable-libmudflap \
-    --disable-libssp \
-    --disable-libgomp \
-    --disable-libquadmath \
-    --enable-languages=c \
-    --without-ppl \
-    --without-cloog \
+../gcc-$VER/configure         \
+    --target=$LFS_TGT          \
+    --prefix=/tools            \
+    --disable-nls              \
+    --disable-shared           \
+    --disable-multilib         \
+    --disable-decimal-float    \
+    --disable-threads          \
+    --disable-libmudflap       \
+    --disable-libssp           \
+    --disable-libgomp          \
+    --disable-libquadmath      \
+    --enable-languages=c       \
+    --without-ppl              \
+    --without-cloog            \
     --with-mpfr-include=$(pwd)/../gcc-$VER/mpfr/src \
     --with-mpfr-lib=$(pwd)/mpfr/src/.libs \
 	1> $LOG/$CHAP.$TARGET.1_conf.log 2>&1 || exit 1

--- a/LFS/5.06.sh
+++ b/LFS/5.06.sh
@@ -3,7 +3,7 @@
 THISFILE=`basename $0`
 CHAP=`echo $THISFILE | sed s/\.sh//`
 
-VER=3.2.11
+VER=3.3
 TARGET=linux-$VER
 TARGETBALL=$TARGET.tar.xz
 TARGETDIR=$TARGET

--- a/LFS/5.07.sh
+++ b/LFS/5.07.sh
@@ -3,9 +3,9 @@
 THISFILE=`basename $0`
 CHAP=`echo $THISFILE | sed s/\.sh//`
 
-VER=2.14.1
+VER=2.15
 TARGET=glibc-$VER
-TARGETBALL=$TARGET.tar.bz2
+TARGETBALL=$TARGET.tar.xz
 TARGETDIR=$TARGET
 
 echo $CHAP: $TARGET
@@ -26,11 +26,13 @@ START=`date +'%Y/%m/%d %H:%M:%S.%N'`
 
 cd $TARGETDIR
 
+sed -i 's#$ac_includes_default#\n\n#' sysdeps/i386/configure
+
+sed -i 's#/var/db#/tools/var/db#' Makeconfig
+
 echo \ \ Patching...
 patch -Np1 -i $DLD/glibc-$VER-gcc_fix-1.patch \
 	1> $LOG/$CHAP.$TARGET.0_patch.log 2>&1 || exit 1
-patch -Np1 -i $DLD/glibc-$VER-cpuid-1.patch \
-	1>> $LOG/$CHAP.$TARGET.0_patch.log 2>&1 || exit 1
 
 mkdir -v ../glibc-build
 cd ../glibc-build
@@ -40,11 +42,17 @@ case `uname -m` in
 esac
 
 echo \ \ Configuring...
-../glibc-$VER/configure --prefix=/tools \
-    --host=$LFS_TGT --build=$(../glibc-$VER/scripts/config.guess) \
-    --disable-profile --enable-add-ons \
-    --enable-kernel=2.6.25 --with-headers=/tools/include \
-    libc_cv_forced_unwind=yes libc_cv_c_cleanup=yes \
+../glibc-$VER/configure                             \
+      --prefix=/tools                                 \
+      --host=$LFS_TGT                                 \
+      --build=$(../glibc-$VER/scripts/config.guess) \
+      --disable-profile                               \
+      --enable-add-ons                                \
+      --enable-kernel=2.6.25                          \
+      --with-headers=/tools/include                   \
+      libc_cv_forced_unwind=yes                       \
+      libc_cv_ctors_header=yes                        \
+      libc_cv_c_cleanup=yes                           \
 	1> $LOG/$CHAP.$TARGET.1_conf.log 2>&1 || exit 1
 
 echo \ \ Making...

--- a/LFS/5.09.sh
+++ b/LFS/5.09.sh
@@ -26,14 +26,21 @@ START=`date +'%Y/%m/%d %H:%M:%S.%N'`
 
 cd $TARGETDIR
 
+echo \ \ Patching...
+patch -Np1 -i ../binutils-2.22-build_fix-1.patch \
+	1> $LOG/$CHAP.$TARGET.0_patch.log 2>&1
+
 mkdir -v ../binutils-build
 cd ../binutils-build
 
 echo \ \ Configuring...
 CC="$LFS_TGT-gcc -B/tools/lib/" \
-   AR=$LFS_TGT-ar RANLIB=$LFS_TGT-ranlib \
-   ../binutils-$VER/configure --prefix=/tools \
-   --disable-nls --with-lib-path=/tools/lib \
+AR=$LFS_TGT-ar                  \
+RANLIB=$LFS_TGT-ranlib          \
+../binutils-$VER/configure      \
+        --prefix=/tools         \
+        --disable-nls           \
+        --with-lib-path=/tools/lib \
 	1> $LOG/$CHAP.$TARGET.1_conf.log 2>&1
 
 echo \ \ Making...

--- a/LFS/5.10.sh
+++ b/LFS/5.10.sh
@@ -3,7 +3,7 @@
 THISFILE=`basename $0`
 CHAP=`echo $THISFILE | sed s/\.sh//`
 
-VER=4.6.3
+VER=4.7.0
 TARGET=gcc-$VER
 TARGETBALL=$TARGET.tar.bz2
 TARGETDIR=$TARGET
@@ -29,7 +29,8 @@ rm -fr gcc-build
 cd $TARGETDIR
 
 echo \ \ Patching...
-patch -Np1 -i $DLD/gcc-$VER-startfiles_fix-1.patch || exit 1
+patch -Np1 -i $DLD/gcc-$VER-startfiles_fix-1.patch \
+	1> $LOG/$CHAP.$TARGET.0_patch.log 2>&1 || exit 1
 
 cp -v gcc/Makefile.in{,.orig}
 sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig > gcc/Makefile.in
@@ -76,14 +77,22 @@ cd ../gcc-build
 
 echo \ \ Configuring...
 CC="$LFS_TGT-gcc -B/tools/lib/" \
-    AR=$LFS_TGT-ar RANLIB=$LFS_TGT-ranlib \
-    ../gcc-$VER/configure --prefix=/tools \
-    --with-local-prefix=/tools --enable-clocale=gnu \
-    --enable-shared --enable-threads=posix \
-    --enable-__cxa_atexit --enable-languages=c,c++ \
-    --disable-libstdcxx-pch --disable-multilib \
-    --disable-bootstrap --disable-libgomp \
-    --without-ppl --without-cloog \
+AR=$LFS_TGT-ar                  \
+RANLIB=$LFS_TGT-ranlib          \
+../gcc-$VER/configure          \
+    --prefix=/tools             \
+    --with-local-prefix=/tools  \
+    --enable-clocale=gnu        \
+    --enable-shared             \
+    --enable-threads=posix      \
+    --enable-__cxa_atexit       \
+    --enable-languages=c,c++    \
+    --disable-libstdcxx-pch     \
+    --disable-multilib          \
+    --disable-bootstrap         \
+    --disable-libgomp           \
+    --without-ppl               \
+    --without-cloog             \
     --with-mpfr-include=$(pwd)/../gcc-$VER/mpfr/src \
     --with-mpfr-lib=$(pwd)/mpfr/src/.libs \
 	1> $LOG/$CHAP.$TARGET.1_conf.log 2>&1 || exit 1