Author: bdubbs
Date: Mon Sep 2 11:10:49 2013
New Revision: 11747
Log:
LFS 7.4 tags
Ensure gcc is used for cups
Modified:
trunk/BOOK/pst/printing/cups.xml
trunk/BOOK/pst/ps/a2ps.xml
trunk/BOOK/pst/ps/enscript.xml
trunk/BOOK/pst/ps/fop.xml
trunk/BOOK/pst/ps/psutils.xml
trunk/BOOK/pst/typesetting/texlive.xml
Modified: trunk/BOOK/pst/printing/cups.xml
==============================================================================
--- trunk/BOOK/pst/printing/cups.xml Mon Sep 2 08:55:05 2013 (r11746)
+++ trunk/BOOK/pst/printing/cups.xml Mon Sep 2 11:10:49 2013 (r11747)
@@ -87,7 +87,7 @@
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended">
<xref linkend="colord"/>,
- <xref linkend="dbus"/> and
+ <xref linkend="dbus"/>, and
<xref linkend="libusb"/>
</para>
@@ -102,7 +102,7 @@
<xref linkend="mitkrb"/>,
<xref linkend="openjdk"/>,
<xref linkend="php"/>,
- <xref linkend="python2"/> and
+ <xref linkend="python2"/>, and
<xref linkend="xdg-utils"/>
</para>
@@ -220,10 +220,12 @@
<screen><userinput>patch -Np1 -i ../cups-&cups-version;-blfs-1.patch &&
aclocal -I config-scripts &&
autoconf -I config-scripts &&
-./configure --libdir=/usr/lib \
- --with-rcdir=/tmp/cupsinit \
+
+CC=gcc \
+./configure --libdir=/usr/lib \
+ --with-rcdir=/tmp/cupsinit \
--with-docdir=/usr/share/cups/doc \
- --with-system-groups=lpadmin &&
+ --with-system-groups=lpadmin &&
make</userinput></screen>
<para>
@@ -265,6 +267,11 @@
<title>Command Explanations</title>
<para>
+ <envar>CC=gcc</envar>: This environment variable ensures that gcc
+ is used if clang is installed. The build fails with the clang compiler.
+ </para>
+
+ <para>
<parameter>--with-rcdir=/tmp/cupsinit</parameter>: This switch tells
the build process to install the shipped bootscript into
<filename class="directory">/tmp</filename> instead of
Modified: trunk/BOOK/pst/ps/a2ps.xml
==============================================================================
--- trunk/BOOK/pst/ps/a2ps.xml Mon Sep 2 08:55:05 2013 (r11746)
+++ trunk/BOOK/pst/ps/a2ps.xml Mon Sep 2 11:10:49 2013 (r11747)
@@ -36,7 +36,7 @@
every input format into PostScript output. The application's name
expands appropriately to <quote>all to PostScript</quote>.</para>
- &lfs73_checked;
+ &lfs74_checked;
<caution>
<para><application>a2ps</application> cannot convert UTF-8 encoded
@@ -114,13 +114,15 @@
commands:</para>
<screen><userinput>autoconf &&
-sed -i "s/GPERF --version |/& head -n 1 |/" configure &&
-sed -i "s|/usr/local/share|/usr/share|" configure &&
-./configure --prefix=/usr \
+sed -i -e "s/GPERF --version |/& head -n 1 |/" \
+ -e "s|/usr/local/share|/usr/share|" configure &&
+
+./configure --prefix=/usr \
--sysconfdir=/etc/a2ps \
- --enable-shared \
- --with-medium=letter &&
-make</userinput></screen>
+ --enable-shared \
+ --with-medium=letter &&
+make &&
+touch doc/*.info</userinput></screen>
<para>To test the results, issue: <command>make check</command>.
The <filename>printers.tst</filename> test will fail, as there is no
default
@@ -179,6 +181,11 @@
wider paper-handling margins. See <filename>/etc/a2ps/a2ps.cfg</filename>
after installation.</para>
+ <para><command>touch doc/*.info</command>: This command avoids trying to
+ regenerate the info files. This is an older package and the current
+ .texi files will produce errors preventing <command>make install</command>
+ from working properly.</para>
+
</sect2>
<sect2 role="configuration">
Modified: trunk/BOOK/pst/ps/enscript.xml
==============================================================================
--- trunk/BOOK/pst/ps/enscript.xml Mon Sep 2 08:55:05 2013 (r11746)
+++ trunk/BOOK/pst/ps/enscript.xml Mon Sep 2 11:10:49 2013 (r11747)
@@ -36,7 +36,7 @@
<para><application>Enscript</application> converts ASCII text files
to PostScript, HTML, RTF, ANSI and overstrikes.</para>
- &lfs73_checked;
+ &lfs74_checked;
<caution>
<para><application>Enscript</application> cannot convert UTF-8 encoded
@@ -95,8 +95,7 @@
make &&
pushd docs &&
-texi2html enscript.texi &&
-makeinfo --plaintext -o enscript.txt enscript.texi &&
+ makeinfo --plaintext -o enscript.txt enscript.texi &&
popd</userinput></screen>
<para>If you have <xref linkend="texlive"/> installed, you can create
@@ -110,7 +109,7 @@
<screen role="root"><userinput>make install &&
install -v -m755 -d /usr/share/doc/enscript-&enscript-version; &&
-install -v -m644 README* *.txt docs/*.{html,txt} \
+install -v -m644 README* *.txt docs/*.txt \
/usr/share/doc/enscript-&enscript-version;</userinput></screen>
<para>If you built Postscript and PDF documentation, install it
@@ -148,7 +147,7 @@
<seg>diffpp, enscript, mkafmmap, over, sliceprint,
and states</seg>
<seg>None</seg>
- <seg>/etc/enscript, /usr/share/doc/enscript-&enscript-version; and
+ <seg>/etc/enscript, /usr/share/doc/enscript-&enscript-version;, and
/usr/share/enscript</seg>
</seglistitem>
</segmentedlist>
Modified: trunk/BOOK/pst/ps/fop.xml
==============================================================================
--- trunk/BOOK/pst/ps/fop.xml Mon Sep 2 08:55:05 2013 (r11746)
+++ trunk/BOOK/pst/ps/fop.xml Mon Sep 2 11:10:49 2013 (r11747)
@@ -51,7 +51,7 @@
SVG, XML (area tree representation), print, AWT, MIF and ASCII text. The
primary output target is PDF.</para>
- &lfs73_checked;
+ &lfs74_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/pst/ps/psutils.xml
==============================================================================
--- trunk/BOOK/pst/ps/psutils.xml Mon Sep 2 08:55:05 2013 (r11746)
+++ trunk/BOOK/pst/ps/psutils.xml Mon Sep 2 11:10:49 2013 (r11747)
@@ -9,7 +9,7 @@
<!ENTITY psutils-md5sum "b161522f3bd1507655326afa7db4a0ad">
<!ENTITY psutils-size "68 KB">
<!ENTITY psutils-buildsize "740 KB">
- <!ENTITY psutils-time "0.01 SBU">
+ <!ENTITY psutils-time "less than 0.1 SBU">
]>
<sect1 id="psutils" xreflabel="PSUtils-&psutils-version;">
@@ -32,7 +32,7 @@
<para><application>PSUtils</application> is a set of utilities to
manipulate
PostScript files.</para>
- &lfs73_checked;
+ &lfs74_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/pst/typesetting/texlive.xml
==============================================================================
--- trunk/BOOK/pst/typesetting/texlive.xml Mon Sep 2 08:55:05 2013
(r11746)
+++ trunk/BOOK/pst/typesetting/texlive.xml Mon Sep 2 11:10:49 2013
(r11747)
@@ -39,7 +39,7 @@
of macros, fonts and documentation; and support for typesetting in many
different scripts from around the world.</para>
- &lfs73_checked;
+ &lfs74_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page