2013/3/30 <matt...@higgs.linuxfromscratch.org>
> Author: matthew
> Date: Fri Mar 29 12:50:55 2013
> New Revision: 10233
>
> Log:
> Fix the alignment of some command continuation constructs.
>
> Modified:
> trunk/BOOK/chapter05/binutils-pass1.xml
> trunk/BOOK/chapter05/binutils-pass2.xml
> trunk/BOOK/chapter05/gcc-pass1.xml
> trunk/BOOK/chapter05/gcc-pass2.xml
> trunk/BOOK/chapter05/glibc.xml
> trunk/BOOK/chapter06/adjusting.xml
> trunk/BOOK/chapter06/glibc.xml
>
> Modified: trunk/BOOK/chapter05/binutils-pass1.xml
>
> ==============================================================================
> --- trunk/BOOK/chapter05/binutils-pass1.xml Fri Mar 29 12:39:17 2013
> (r10232)
> +++ trunk/BOOK/chapter05/binutils-pass1.xml Fri Mar 29 12:50:55 2013
> (r10233)
> @@ -78,7 +78,7 @@
>
> <para>Now prepare Binutils for compilation:</para>
>
> -<screen><userinput
> remap="configure">../binutils-&binutils-version;/configure \
> +<screen><userinput
> remap="configure">../binutils-&binutils-version;/configure \
> --prefix=/tools \
> --with-sysroot=$LFS \
> --with-lib-path=/tools/lib \
>
> Modified: trunk/BOOK/chapter05/binutils-pass2.xml
>
> ==============================================================================
> --- trunk/BOOK/chapter05/binutils-pass2.xml Fri Mar 29 12:39:17 2013
> (r10232)
> +++ trunk/BOOK/chapter05/binutils-pass2.xml Fri Mar 29 12:50:55 2013
> (r10233)
> @@ -56,12 +56,12 @@
>
> <para>Prepare Binutils for compilation:</para>
>
> -<screen><userinput remap="configure">CC=$LFS_TGT-gcc \
> -AR=$LFS_TGT-ar \
> -RANLIB=$LFS_TGT-ranlib \
> -../binutils-&binutils-version;/configure \
> - --prefix=/tools \
> - --disable-nls \
> +<screen><userinput remap="configure">CC=$LFS_TGT-gcc \
> +AR=$LFS_TGT-ar \
> +RANLIB=$LFS_TGT-ranlib \
> +../binutils-&binutils-version;/configure \
> + --prefix=/tools \
> + --disable-nls \
> --with-lib-path=/tools/lib \
> --with-sysroot</userinput></screen>
>
>
> Modified: trunk/BOOK/chapter05/gcc-pass1.xml
>
> ==============================================================================
> --- trunk/BOOK/chapter05/gcc-pass1.xml Fri Mar 29 12:39:17 2013
> (r10232)
> +++ trunk/BOOK/chapter05/gcc-pass1.xml Fri Mar 29 12:50:55 2013
> (r10233)
> @@ -113,28 +113,28 @@
>
> <para>Prepare GCC for compilation:</para>
>
> -<screen><userinput remap="configure">../gcc-&gcc-version;/configure
> \
> - --target=$LFS_TGT \
> - --prefix=/tools \
> - --with-sysroot=$LFS \
> - --with-newlib \
> - --without-headers \
> - --with-local-prefix=/tools \
> - --with-native-system-header-dir=/tools/include \
> - --disable-nls \
> - --disable-shared \
> - --disable-multilib \
> - --disable-decimal-float \
> - --disable-threads \
> - --disable-libatomic \
> - --disable-libgomp \
> - --disable-libitm \
> - --disable-libmudflap \
> - --disable-libquadmath \
> - --disable-libsanitizer \
> - --disable-libssp \
> - --disable-libstdc++-v3 \
> - --enable-languages=c,c++ \
> +<screen><userinput remap="configure">../gcc-&gcc-version;/configure
> \
> + --target=$LFS_TGT \
> + --prefix=/tools \
> + --with-sysroot=$LFS \
> + --with-newlib \
> + --without-headers \
> + --with-local-prefix=/tools \
> + --with-native-system-header-dir=/tools/include \
> + --disable-nls \
> + --disable-shared \
> + --disable-multilib \
> + --disable-decimal-float \
> + --disable-threads \
> + --disable-libatomic \
> + --disable-libgomp \
> + --disable-libitm \
> + --disable-libmudflap \
> + --disable-libquadmath \
> + --disable-libsanitizer \
> + --disable-libssp \
> + --disable-libstdc++-v3 \
> + --enable-languages=c,c++ \
> --with-mpfr-include=$(pwd)/../gcc-&gcc-version;/mpfr/src \
> --with-mpfr-lib=$(pwd)/mpfr/src/.libs</userinput></screen>
>
>
> Modified: trunk/BOOK/chapter05/gcc-pass2.xml
>
> ==============================================================================
> --- trunk/BOOK/chapter05/gcc-pass2.xml Fri Mar 29 12:39:17 2013
> (r10232)
> +++ trunk/BOOK/chapter05/gcc-pass2.xml Fri Mar 29 12:50:55 2013
> (r10233)
> @@ -107,23 +107,24 @@
>
> <para>Now prepare GCC for compilation:</para>
>
> -<screen><userinput remap="configure">CC=$LFS_TGT-gcc \
> -CXX=$LFS_TGT-g++ \
> -AR=$LFS_TGT-ar \
> -RANLIB=$LFS_TGT-ranlib \
> -../gcc-&gcc-version;/configure \
> - --prefix=/tools \
> - --with-local-prefix=/tools \
> - --with-native-system-header-dir=/tools/include \
> - --enable-clocale=gnu \
> - --enable-shared \
> - --enable-threads=posix \
> - --enable-__cxa_atexit \
> - --enable-languages=c,c++ \
> - --disable-libstdcxx-pch \
> - --disable-multilib \
> - --disable-bootstrap \
> - --disable-libgomp \
> +<screen><userinput remap="configure">
> +CC=$LFS_TGT-gcc \
> +CXX=$LFS_TGT-g++ \
> +AR=$LFS_TGT-ar \
> +RANLIB=$LFS_TGT-ranlib \
> +../gcc-&gcc-version;/configure \
> + --prefix=/tools \
> + --with-local-prefix=/tools \
> + --with-native-system-header-dir=/tools/include \
> + --enable-clocale=gnu \
> + --enable-shared \
> + --enable-threads=posix \
> + --enable-__cxa_atexit \
> + --enable-languages=c,c++ \
> + --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</userinput></screen>
>
>
> Modified: trunk/BOOK/chapter05/glibc.xml
>
> ==============================================================================
> --- trunk/BOOK/chapter05/glibc.xml Fri Mar 29 12:39:17 2013
> (r10232)
> +++ trunk/BOOK/chapter05/glibc.xml Fri Mar 29 12:50:55 2013
> (r10233)
> @@ -76,14 +76,14 @@
> <para>Next, prepare Glibc for compilation:</para>
>
> <screen><userinput remap="configure">../glibc-&glibc-version;/configure
> \
> - --prefix=/tools \
> - --host=$LFS_TGT \
> + --prefix=/tools \
> + --host=$LFS_TGT \
> --build=$(../glibc-&glibc-version;/scripts/config.guess) \
> - --disable-profile \
> - --enable-kernel=2.6.25 \
> - --with-headers=/tools/include \
> - libc_cv_forced_unwind=yes \
> - libc_cv_ctors_header=yes \
> + --disable-profile \
> + --enable-kernel=2.6.25 \
> + --with-headers=/tools/include \
> + libc_cv_forced_unwind=yes \
> + libc_cv_ctors_header=yes \
> libc_cv_c_cleanup=yes</userinput></screen>
>
> <variablelist>
>
> Modified: trunk/BOOK/chapter06/adjusting.xml
>
> ==============================================================================
> --- trunk/BOOK/chapter06/adjusting.xml Fri Mar 29 12:39:17 2013
> (r10232)
> +++ trunk/BOOK/chapter06/adjusting.xml Fri Mar 29 12:50:55 2013
> (r10233)
> @@ -30,9 +30,9 @@
> so that GCC knows where to find the correct headers and Glibc start
> files.
> A <command>sed</command> command accomplishes this:</para>
>
> -<screen><userinput>gcc -dumpspecs | sed -e 's@/tools@@g' \
> +<screen><userinput>gcc -dumpspecs | sed -e 's@/tools@@g'
> \
> -e '/\*startfile_prefix_spec:/{n;s@.*@/usr/lib/ @}' \
> - -e '/\*cpp:/{n;s@$@ -isystem /usr/include@}' > \
> + -e '/\*cpp:/{n;s@$@ -isystem /usr/include@}' & \
>
You should not change > to &
> `dirname $(gcc --print-libgcc-file-name)`/specs</userinput></screen>
>
> <para>It is a good idea to visually inspect the specs file to verify the
>
> Modified: trunk/BOOK/chapter06/glibc.xml
>
> ==============================================================================
> --- trunk/BOOK/chapter06/glibc.xml Fri Mar 29 12:39:17 2013
> (r10232)
> +++ trunk/BOOK/chapter06/glibc.xml Fri Mar 29 12:50:55 2013
> (r10233)
> @@ -69,7 +69,7 @@
>
> <para>Prepare Glibc for compilation:</para>
>
> -<screen><userinput remap="configure">../glibc-&glibc-version;/configure \
> +<screen><userinput remap="configure">../glibc-&glibc-version;/configure
> \
> --prefix=/usr \
> --disable-profile \
> --enable-kernel=2.6.25 \
> --
> http://linuxfromscratch.org/mailman/listinfo/lfs-book
> FAQ: http://www.linuxfromscratch.org/lfs/faq.html
> Unsubscribe: See the above information page
>
--
http://linuxfromscratch.org/mailman/listinfo/lfs-dev
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
