aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml5
-rw-r--r--chapter06/chapter06.xml2
-rw-r--r--chapter06/gettext.xml17
3 files changed, 22 insertions, 2 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 328da44b5..7309c6e7f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -46,6 +46,11 @@
<para>2020-04-19</para>
<itemizedlist>
<listitem>
+ <para>[pierre] - Allow bison to use the libtextstyle.so library from
+ gettext, by moving gettext before bison. Fixes
+ <ulink url="&lfs-ticket-root;4634">#4634</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[pierre] - Allow some shadow programs to use "setcap" by
moving libcap before shadow. Fixes
<ulink url="&lfs-ticket-root;4633">#4633</ulink>.</para>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 6322e3cab..a6b15f6b5 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -42,6 +42,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grep.xml"/>
@@ -57,7 +58,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autoconf.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automake.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmod.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libelf.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libffi.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssl.xml"/>
diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml
index ef4b24741..2c4683804 100644
--- a/chapter06/gettext.xml
+++ b/chapter06/gettext.xml
@@ -76,7 +76,22 @@ sed -i 's/test-lock..EXEEXT.//' gettext-tools/gnulib-tests/Makefile.in</userinpu
<para>Compile the package:</para>
-<screen><userinput remap="make">make</userinput></screen>
+<screen><userinput remap="make">make BISON_LOCALEDIR=/usr/share/locale</userinput></screen>
+
+ <variablelist>
+ <title>The meaning of the make parameter:</title>
+
+ <varlistentry>
+ <term><parameter>BISON_LOCALEDIR=/usr/share/locale</parameter></term>
+ <listitem>
+ <para>Since bison is not yet installed in /usr, configure hardcodes
+ the directory containing translations for the bison program (the
+ "locale" directory) as /tools/share/locale. Passing this variable
+ to make allows overriding the choice made by configure.</para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
<para>To test the results (this takes a long time, around 3 SBUs),
issue:</para>