Changeset 32edd3a in clfs-sysroot

Timestamp:

Nov 23, 2006, 8:56:08 PM (17 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

master

Children:

4127a0b

Parents:

a186108

Message:

Replace the glibc crosscompile timezone fix patch with the glibc cross hacks patch. The new patch has support for zoneinfo, locales, and librpcsvc.

Files:

• BOOK/cross-tools/common/glibc.xml (modified) (4 diffs)
• BOOK/introduction/common/changelog.xml (modified) (1 diff)
• BOOK/materials/common/patches.xml (modified) (1 diff)
• BOOK/patches.ent (modified) (1 diff)
• patches/glibc-2.5-cross_hacks-1.patch (added)
• patches/glibc-2.5-crosscompile_timezone_fix-1.patch (deleted)

BOOK/cross-tools/common/glibc.xml

@@ -52 +52 @@
 <screen os="p4"><userinput>patch -Np1 -i ../&glibc-localedef_segfault-patch;</userinput></screen>
 
-    <para os="p5">The following patch changes the way glibc generates it's
-    timezone information so that it can be generated when
-    cross-compiling:</para>
-
-<screen os="p6"><userinput>patch -Np1 -i ../&glibc-crosscompile_timezone_fix-patch;</userinput></screen>
+    <para os="p5">The following patch builds <filename>zic-native</filename>,
+    <filename>localedef-native</filename>, and
+    <filename>rpcgen-native</filename>. <filename>zic-native</filename> is used
+    to generate the zoneinfo, <filename>localedef-native</filename> is used to
+    generate the locale archive, and <filename>rpcgen-native</filename> is used
+    to generate part of <filename>librpcsvc.a</filename>. All of which would
+    normally not be available when cross-compiling:</para>
+
+<screen os="p6"><userinput>patch -Np1 -i ../&glibc-cross_hacks-patch;</userinput></screen>
 
     <para os="p7">The following corrects the Minor version, changing the value
@@ -197 +201 @@
 
   <sect2 id="i18n-glibc" role="configuration">
-    <title>Internationalization (Current method is no good, REWRITE ME)</title>
+    <title>Internationalization</title>
 
     <para>The locales that can make the system respond in a different
@@ -203 +207 @@
     with:</para>
 
-<screen role="nodump"><userinput>make localedata/install-locales</userinput></screen>
+<screen><userinput>make localedata/install-locales</userinput></screen>
 
     <para>To save time, an alternative to running the previous command (which
@@ -219 +223 @@
 
 <screen role="nodump"><userinput>mkdir -pv ${CLFS}/usr/lib/locale
-localedef -i de_DE -f ISO-8859-1 de_DE
-localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro
-localedef -i en_HK -f ISO-8859-1 en_HK
-localedef -i en_PH -f ISO-8859-1 en_PH
-localedef -i en_US -f ISO-8859-1 en_US
-localedef -i es_MX -f ISO-8859-1 es_MX
-localedef -i fa_IR -f UTF-8 fa_IR
-localedef -i fr_FR -f ISO-8859-1 fr_FR
-localedef -i fr_FR@euro -f ISO-8859-15 fr_FR@euro
-localedef -i it_IT -f ISO-8859-1 it_IT
-localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen>
+export I18NPATH=${PWD}/localedata
+export GCONV_PATH=${PWD}/iconvdata
+export LOCALEDEF="${PWD}/locale/localedef-native --alias-file=../intl/locale.alias"
+cd ../glibc-&glibc-version;/localedata
+${LOCALEDEF} -i locales/de_DE -f charmaps/ISO-8859-1 --prefix=${CLFS} de_DE
+${LOCALEDEF} -i locales/de_DE@euro -f charmaps/ISO-8859-15 --prefix=${CLFS} de_DE@euro
+${LOCALEDEF} -i locales/en_HK -f charmaps/ISO-8859-1 --prefix=${CLFS} en_HK
+${LOCALEDEF} -i locales/en_PH -f charmaps/ISO-8859-1 --prefix=${CLFS} en_PH
+${LOCALEDEF} -i locales/en_US -f charmaps/ISO-8859-1 --prefix=${CLFS} en_US
+${LOCALEDEF} -i locales/es_MX -f charmaps/ISO-8859-1 --prefix=${CLFS} es_MX
+${LOCALEDEF} -i locales/fa_IR -f charmaps/UTF-8 --prefix=${CLFS} fa_IR
+${LOCALEDEF} -i locales/fr_FR -f charmaps/ISO-8859-1 --prefix=${CLFS} fr_FR
+${LOCALEDEF} -i locales/fr_FR@euro -f charmaps/ISO-8859-15 --prefix=${CLFS} fr_FR@euro
+${LOCALEDEF} -i locales/it_IT -f charmaps/ISO-8859-1 --prefix=${CLFS} it_IT
+${LOCALEDEF} -i locales/ja_JP -f charmaps/EUC-JP --prefix=${CLFS} ja_JP</userinput></screen>
 
     <para>Some locales installed by the <command>make

BOOK/introduction/common/changelog.xml

@@ -40 +40 @@
       <para>November 23, 2006</para>
       <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Replace the glibc crosscompile timezone fix patch
+          with the glibc cross hacks patch. The new patch has support for
+          zoneinfo, locales, and librpcsvc.</para>
+        </listitem>
         <listitem>
           <para>[jciccone] - Update the Glibc libgcc_eh patch to -2. The new

BOOK/materials/common/patches.xml

@@ -119 +119 @@
 
     <varlistentry>
-      <term>Glibc Timezone Patch- <token>&glibc-crosscompile_timezone_fix-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&glibc-crosscompile_timezone_fix-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-crosscompile_timezone_fix-patch-md5;</literal></para>
+      <term>Glibc Cross-Compiling Hacks Patch- <token>&glibc-cross_hacks-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&glibc-cross_hacks-patch;"/></para>
+        <para>MD5 sum: <literal>&glibc-cross_hacks-patch-md5;</literal></para>
       </listitem>
     </varlistentry>

BOOK/patches.ent

@@ -49 +49 @@
 <!ENTITY gcc-posix-patch-size "9 KB">
 
-<!ENTITY glibc-crosscompile_timezone_fix-patch "glibc-&glibc-version;-crosscompile_timezone_fix-1.patch">
-<!ENTITY glibc-crosscompile_timezone_fix-patch-md5 "d46ffc949ebc894974d719c8235be6f6">
-<!ENTITY glibc-crosscompile_timezone_fix-patch-size "4 KB">
+<!ENTITY glibc-cross_hacks-patch "glibc-&glibc-version;-cross_hacks-1.patch">
+<!ENTITY glibc-cross_hacks-patch-md5 "c3ea44100f9f731b7ca52beab8f28f12">
+<!ENTITY glibc-cross_hacks-patch-size "20 KB">
 
 <!ENTITY glibc-minor-patch "glibc-&glibc-version;-MINOR-1.patch">