Ticket #2948: lfs7-consistency.patch

chapter05/gcc-pass1.xml

@@ -78 +78 @@
     --disable-libgomp --disable-libquadmath \
     --disable-target-libiberty --disable-target-zlib \
     --enable-languages=c --without-ppl --without-cloog \
-    --with-mpfr-include=$LFS/sources/gcc-&gcc-version;/mpfr/src \
-    --with-mpfr-lib=$LFS/sources/gcc-build/mpfr/src/.libs</userinput></screen>
+    --with-mpfr-include=${PWD}/../gcc-&gcc-version;/mpfr/src \
+    --with-mpfr-lib=${PWD}/mpfr/src/.libs</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>

chapter05/gcc-pass2.xml

@@ -158 +158 @@
     --disable-libstdcxx-pch --disable-multilib \
     --disable-bootstrap --disable-libgomp \
     --without-ppl --without-cloog \
-    --with-mpfr-include=$LFS/sources/gcc-&gcc-version;/mpfr/src \
-    --with-mpfr-lib=$LFS/sources/gcc-build/mpfr/src/.libs</userinput></screen>
+    --with-mpfr-include=${PWD}/../gcc-&gcc-version;/mpfr/src \
+    --with-mpfr-lib=${PWD}/mpfr/src/.libs</userinput></screen>
 
     <variablelist>
       <title>The meaning of the new configure options:</title>

chapter06/gmp.xml

@@ -52 +52 @@
 
     <para>First, fix a minor error noted on the upstream web page:</para>
 
-<screen><userinput remap="pre"> sed -i 's/np + dn, qn/&amp; - dn/' mpn/generic/dcpi1_bdiv_q.c</userinput></screen>
+<screen><userinput remap="pre">sed -i 's/np + dn, qn/&amp; - dn/' mpn/generic/dcpi1_bdiv_q.c</userinput></screen>
 
 
     <para>Prepare GMP for compilation:</para>

chapter06/grep.xml

@@ -42 +42 @@
 
     <para>First, fix a small problem with a test script:</para>
 
-<screen><userinput>sed -i 's/cp/#&amp;/' tests/unibyte-bracket-expr</userinput></screen>
+<screen><userinput remap="pre">sed -i 's/cp/#&amp;/' tests/unibyte-bracket-expr</userinput></screen>
 
     <para>Prepare Grep for compilation:</para>
 

chapter06/iproute2.xml

@@ -49 +49 @@
     <ulink url="&blfs-root;view/svn/server/databases.html#db"/>.
     </para>
 
-<screen><userinput>sed -i '/^TARGETS/s@arpd@@g' misc/Makefile</userinput></screen>
+<screen><userinput remap="pre">sed -i '/^TARGETS/s@arpd@@g' misc/Makefile</userinput></screen>
 
     <para>Compile the package:</para>
 

prologue/hostreqs.xml

@@ -154 +154 @@
 # Simple script to list version numbers of critical development tools
 
 bash --version | head -n1 | cut -d" " -f2-4
-echo "/bin/sh -> `readlink -f /bin/sh`"
+echo "/bin/sh -> `readlink -f /bin/sh`"
 echo -n "Binutils: "; ld --version | head -n1 | cut -d" " -f3-
 bison --version | head -n1
 if [ -e /usr/bin/yacc ];
-  then echo "/usr/bin/yacc -> `readlink -f /usr/bin/yacc`"; 
+  then echo "/usr/bin/yacc -> `readlink -f /usr/bin/yacc`"; 
   else echo "yacc not found"; fi
 bzip2 --version 2>&1 < /dev/null | head -n1 | cut -d" " -f1,6-
 echo -n "Coreutils: "; chown --version | head -n1 | cut -d")" -f2
@@ -166 +166 @@
 find --version | head -n1
 gawk --version | head -n1
 if [ -e /usr/bin/awk ];
-  then echo "/usr/bin/awk -> `readlink -f /usr/bin/awk`"; 
+  then echo "/usr/bin/awk -> `readlink -f /usr/bin/awk`"; 
   else echo "awk not found"; fi
 gcc --version | head -n1
 /lib/libc.so.6 | head -n1 | cut -d"," -f1
@@ -181 +181 @@
 tar --version | head -n1
 echo "Texinfo: `makeinfo --version | head -n1`"
 xz --version | head -n1
-echo 'main(){}' > dummy.c && gcc -o dummy dummy.c
+echo 'main(){}' > dummy.c && gcc -o dummy dummy.c
 if [ -x dummy ]; then echo "Compilation OK";
   else echo "Compilation failed"; fi
 rm -f dummy.c dummy