Changeset 0e92f49

Timestamp:

02/28/2005 08:39:06 PM (18 years ago)

Author:

Randy McMurchy <randy@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 6.0, 6.1, 6.2, 6.2.0, 6.2.0-rc1, 6.2.0-rc2, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, ken/inkscape-core-mods, krejzi/svn, lazarus, nosym, perl-modules, plabs/python-mods, qt5new, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226

Children:

bd839f8

Parents:

09c3df0

Message:

Added missing ampersands in tcp_wrappers instructions; added more MD5 sums and additional commands/notes to the GCC instructions

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@3506 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• basicnet/netprogs/tcpwrappers.xml (modified) (1 diff)
• general/prog/gcc.xml (modified) (10 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

basicnet/netprogs/tcpwrappers.xml

@@ -60 +60 @@
 
 <screen><userinput><command>patch -Np1 -i ../tcp_wrappers-&tcpwrappers-version;-shared_lib_plus_plus-1.patch &amp;&amp;
-sed -i -e "s,^extern char \*malloc();,/* &amp; */," scaffold.c
+sed -i -e "s,^extern char \*malloc();,/* &amp; */," scaffold.c &amp;&amp;
 make REAL_DAEMON_DIR=/usr/sbin STYLE=-DPROCESS_OPTIONS linux &amp;&amp;
 make install</command></userinput></screen>

general/prog/gcc.xml

@@ -14 +14 @@
   <!ENTITY gnat-download-http " ">
   <!ENTITY gnat-download-ftp  "ftp://cs.nyu.edu/pub/gnat/3.15p/gnat-3.15p-i686-pc-redhat71-gnu-bin.tar.gz">
+  <!ENTITY gnat-md5sum        "57c060cd1ccef8b1ae9165b11d98780a">
   <!ENTITY gnat-size          "13.5 MB">
   <!ENTITY gnat-buildsize     "48 MB">
   <!ENTITY gnat-time          "0.01 SBU">
+
+  <!ENTITY gcc-testsuite-url    "http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-&gcc-version;/gcc-testsuite-&gcc-version;.tar.bz2">
+  <!ENTITY gcc-testsuite-md5sum "641f45606e17db4a3079cb7364a9e295">
 ]>
 
@@ -55 +59 @@
 <sect3><title>Additional Downloads</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Required Patch: <ulink 
+<listitem><para>Required patch: <ulink 
 url="&patch-root;/gcc-&gcc-version;-no_fixincludes-1.patch"/></para></listitem>
-<listitem><para>Required Patch: <ulink 
+<listitem><para>Required patch: <ulink 
 url="&patch-root;/gcc-&gcc-version;-linkonce-1.patch"/></para></listitem>
-<listitem><para>Test Suite: <ulink 
-url="http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-&gcc-version;/gcc-testsuite-&gcc-version;.tar.bz2"/></para>
-</listitem>
+<listitem><para>Test suite: <ulink url="&gcc-testsuite-url;"/></para></listitem>
+<listitem><para>Test suite MD5 sum: &gcc-testsuite-md5sum;</para></listitem>
 </itemizedlist></sect3>
 
@@ -70 +73 @@
 <listitem><para><xref linkend="dejagnu"/></para></listitem>
 </itemizedlist>
-</sect4></sect3>
+</sect4>
+</sect3>
 
 </sect2>
@@ -89 +93 @@
 <listitem><para>Download (FTP): <ulink
 url="&gnat-download-ftp;"/></para></listitem>
+<listitem><para>Download MD5 sum: &gnat-md5sum;</para></listitem>
 <listitem><para>Download size: &gnat-size;</para></listitem>
 <listitem><para>Estimated disk space required:
@@ -162 +167 @@
 may also want to refer to the information found in the 
 <application><acronym>GCC</acronym></application>-Pass 2 section of Chapter 5 
-in the <acronym>LFS</acronym> book.</para></important>
+in the <acronym>LFS</acronym> book 
+(<ulink url="&lfs-root;/chapter05/gcc-pass2.html"/>).</para></important>
 
 <note><para>Some of the <application>Java</application> programs installed by 
@@ -169 +175 @@
 you're installing the <application>Java</application> language from the 
 <application><acronym>GCC</acronym></application> package but you wish to 
-use the programs from the <application>JDK</application> as the defaults, 
+use the programs from the <application>J2SDK</application> as the defaults, 
 ensure <filename class='directory'>$JAVA_HOME/bin</filename> is listed before 
 <filename class='directory'>/usr/bin</filename> in your <envar>PATH</envar> 
@@ -180 +186 @@
 cd ../gcc-build &amp;&amp;
 ../gcc-&gcc-version;/configure --prefix=/usr --libexecdir=/usr/lib \
-    --enable-shared --enable-languages=c,c++,objc,f77,ada,java \
-    --enable-threads=posix --enable-__cxa_atexit --enable-clocale=gnu &amp;&amp;
+    --enable-shared --enable-threads=posix --enable-__cxa_atexit \
+    --enable-clocale=gnu --enable-languages=c,c++,objc,f77,ada,java &amp;&amp;
 make bootstrap &amp;&amp;
 make -C gcc gnatlib-shared &amp;&amp;
@@ -194 +200 @@
 ln -v -sf gcc /usr/bin/cc &amp;&amp;
 ln -v -sf g77 /usr/bin/f77 &amp;&amp;
-chown -v -R root:root /usr/lib/gcc/i686-pc-linux-gnu/&gcc-version;/include</command></userinput></screen>
+chown -v -R root:root /usr/lib/gcc/i686-pc-linux-gnu/&gcc-version;/include &amp;&amp;
+chown -v -R root:root /usr/lib/gcc/i686-pc-linux-gnu/&gcc-version;/ada{lib,include}</command></userinput></screen>
 
 <para>You may remove the <application><acronym>GNAT</acronym></application>
@@ -216 +223 @@
 building the package in a dedicated build directory.</para>
 
+<para><parameter>--enable-shared --enable-threads=posix
+--enable-__cxa_atexit</parameter>: These commands are required to build
+the <application>C++</application> libraries to published standards.</para>
+
+<para><parameter>--enable-clocale=gnu</parameter>: This command is a
+failsafe for incomplete locale data.</para>
+
 <para><parameter>--enable-languages=c,c++,objc,f77,ada,java</parameter>: 
 This command identifies which languages to build. You may modify this command 
 to remove undesired languages.</para>
-
-<para><parameter>--enable-shared --enable-threads=posix
---enable-__cxa_atexit</parameter>: These commands are required to build
-the <application>C++</application> libraries to published standards.</para>
-
-<para><parameter>--enable-clocale=gnu</parameter>: This command is a
-failsafe for incomplete locale data.</para>
 
 <para><command>make -C gcc gnatlib-shared</command>: This command builds the 
@@ -252 +259 @@
 using an alternate name.</para> 
 
-<para><command>chown -R root:root 
-/usr/lib/gcc/i686-pc-linux-gnu/&gcc-version;/include</command>: 
+<para><command>chown -R root:root /usr/lib/gcc/i686-pc-linux-gnu/...</command>: 
 If the package is built by a user other than root, the ownership of the 
-installed <filename class='directory'>include</filename> directory (and its 
-contents) will be incorrect. This command changes the ownership to 
-root:root.</para>
+installed <filename class='directory'>include</filename> and 
+<filename class='directory'>adalib</filename> directories (and their 
+contents) will be incorrect. These commands change the ownership to 
+root:root. Omit the command changing the Ada directories if you did not 
+include Ada as one of the installed languages.</para>
 
 </sect2>

introduction/welcome/changelog.xml

@@ -24 +24 @@
 
 <listitem><para>February 28th, 2005 [randy]: Changed the tcp_wrappers 
-instructions to use a sed command instead of a GCC-34 patch.</para></listitem>
+instructions to use a sed command instead of a GCC-34 patch; added more 
+MD5 sums and some additional commands/notes to the GCC 
+instructions.</para></listitem>
 
 <listitem><para>February 27th, 2005 [randy]: Added dependencies and