Changeset 924206c

Timestamp:

Sep 4, 2015, 6:26:57 PM (9 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

sysvinit

Children:

23d7b98

Parents:

7709fcb

git-author:

William Harrington <kb0iic@…> (09/04/15 18:22:16)

git-committer:

William Harrington <kb0iic@…> (09/04/15 18:26:57)

Message:

Update Gettext to 0.19.5.1 from 0.19.3.

Location:

BOOK

Files:

• introduction/common/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• temp-system/common/gettext.xml (modified) (2 diffs)

BOOK/introduction/common/changelog.xml

@@ -64 +64 @@
           <ulink url="&clfs-ticket-root;1047">#1047.</ulink></para> 
         </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Gettext to 0.19.5.1. Fixes ticket
+          <ulink url="&clfs-ticket-root;1048">#1048.</ulink></para> 
+        </listitem>
       </itemizedlist>
     </listitem>

BOOK/packages.ent

@@ -172 +172 @@
 <!ENTITY gdbm-home "&gnu-software;gdbm">
 
-<!ENTITY gettext-version "0.19.3">
-<!ENTITY gettext-size "6,628 KB">
+<!ENTITY gettext-version "0.19.5.1">
+<!ENTITY gettext-size "6,874 KB">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz">
-<!ENTITY gettext-md5 "092c3f460553ceb4a638ff81d36434c4">
+<!ENTITY gettext-md5 "9b7c37e410df4bd1bf854e8c897cf937">
 <!ENTITY gettext-home "&gnu-software;gettext">
 

BOOK/temp-system/common/gettext.xml

@@ -33 +33 @@
 <screen os="b"><userinput>cd gettext-tools</userinput></screen>
 
-    <para os="t1">When cross-compiling, the Gettext
-    <command>configure</command> script assumes we don't have a working wcwidth
-    even when we do. The following will fix possible
-    compilation errors because of this assumption:</para>
-
-<screen os="t2"><userinput>echo "gl_cv_func_wcwidth_works=yes" &gt; config.cache</userinput></screen>
-
     <para os="c">Prepare Gettext for compilation:</para>
 
-<screen os="d"><userinput>./configure --prefix=/tools \
+<screen os="d"><userinput>EMACS="no" ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --disable-shared --cache-file=config.cache</userinput></screen>
@@ -55 +48 @@
 <screen os="h"><userinput>cp -v src/msgfmt /tools/bin</userinput></screen>
 
+<variablelist os="i">
+      <title>The meaning of the configure option:</title>
+
+      <varlistentry>
+        <term><parameter>EMACS="no"</parameter></term>
+        <listitem>
+          <para>This prevents the installation of the Emacs Lisp files
+          as the test is known to hang on some hosts.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+    <para os="j">Compile the required programs and support library:</para>
+
+<screen os="k"><userinput>make -C gnulib-lib
+make -C intl pluralx.c
+make -C src msgfmt msgmerge xgettext</userinput></screen>
+
+    <para os="l">Install the <command>msgfmt</command>,
+    <command>msgmerge</command> and <command>xgettext</command> binaries:</para>
+
+<screen os="m"><userinput>cp -v src/{msgfmt,msgmerge,xgettext} /tools/bin</userinput></screen>
+
   </sect2>