From 8aa7fdeb1c7acf441548f5b19f9e342cce67924f Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Tue, 20 May 2014 00:44:22 +0000 Subject: Remove unneeded confiugure switches from gcc. Restore installation of udev-lfs support files. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10567 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 13 +++++++++++++ chapter05/gcc-pass1.xml | 14 +------------- chapter05/gcc-pass2.xml | 4 +--- chapter06/eudev.xml | 22 ++++------------------ chapter07/symlinks.xml | 4 ++-- general.ent | 4 ++-- 6 files changed, 23 insertions(+), 38 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index e2beaae81..a48d51012 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -35,6 +35,19 @@ --> + + 2014-05-19 + + + [bdubbs] - Remove unneeded configure switches from gcc. Fixes + #3582. + + + [bdubbs] - Restore installation of udev-lfs support files. + + + + 2014-05-15 diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml index 38597341e..0900831f6 100644 --- a/chapter05/gcc-pass1.xml +++ b/chapter05/gcc-pass1.xml @@ -129,17 +129,13 @@ cd ../gcc-build --disable-libatomic \ --disable-libgomp \ --disable-libitm \ - --disable-libmudflap \ --disable-libquadmath \ --disable-libsanitizer \ --disable-libssp \ --disable-libvtv \ --disable-libcilkrts \ --disable-libstdc++-v3 \ - --enable-languages=c,c++ \ - --with-mpfr-include=$(pwd)/../gcc-&gcc-version;/mpfr/src \ - --with-mpfr-lib=$(pwd)/mpfr/src/.libs - + --enable-languages=c,c++ The meaning of the configure options: @@ -224,14 +220,6 @@ cd ../gcc-build - - --with-mpfr-* - - These options enable the build system to correctly use the - in-tree copy of the MPFR sources. - - - Compile GCC by running: diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index 27c411306..85cc1aff9 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -121,9 +121,7 @@ RANLIB=$LFS_TGT-ranlib \ --disable-libstdcxx-pch \ --disable-multilib \ --disable-bootstrap \ - --disable-libgomp \ - --with-mpfr-include=$(pwd)/../gcc-&gcc-version;/mpfr/src \ - --with-mpfr-lib=$(pwd)/mpfr/src/.libs + --disable-libgomp The meaning of the new configure options: diff --git a/chapter06/eudev.xml b/chapter06/eudev.xml index 82198e91a..b0fd145b3 100644 --- a/chapter06/eudev.xml +++ b/chapter06/eudev.xml @@ -89,25 +89,11 @@ mkdir -pv /etc/udev/rules.d tar -xvf ../eudev-&eudev-version;-manpages.tar.bz2 -C /usr/share - Finally, create some custom rules that are not covered as a part of the - defaults: + Finally, install some custom rules and support files useful in an LFS + environment: -cat > /etc/udev/rules.d/55-lfs.rules << "EOF" -# /etc/udev/rules.d/55-lfs.rules: Rule definitions for LFS. - -# Core kernel devices - -# This causes the system clock to be set as soon as /dev/rtc becomes available. -SUBSYSTEM=="rtc", ACTION=="add", MODE="0644", RUN+="/etc/rc.d/init.d/setclock start" -KERNEL=="rtc", ACTION=="add", MODE="0644", RUN+="/etc/rc.d/init.d/setclock start" - -# Comms devices - -KERNEL=="ippp[0-9]*", GROUP="dialout" -KERNEL=="isdn[0-9]*", GROUP="dialout" -KERNEL=="isdnctrl[0-9]*", GROUP="dialout" -KERNEL=="dcbri[0-9]*", GROUP="dialout" -EOF +tar -xvf ../&udev-lfs-version;.tar.bz2 +make -f &udev-lfs-version;/Makefile.lfs install diff --git a/chapter07/symlinks.xml b/chapter07/symlinks.xml index cf06009a5..23e3026ef 100644 --- a/chapter07/symlinks.xml +++ b/chapter07/symlinks.xml @@ -48,9 +48,9 @@ rules. A script has been included that generates the initial rules. Generate these rules by running: -bash /lib/udev/init-net-rules.sh +bash /lib/udev/init-net-rules.sh - Now, inspect th + Now, inspect the /etc/udev/rules.d/70-persistent-net.rules file, to find out which name was assigned to which network device: diff --git a/general.ent b/general.ent index c993c5bb7..e29107d4d 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ - + - + -- cgit v1.2.3-54-g00ecf