[Clfs-commits] commit: r4327 - in /branches/clfs-sysroot/BOOK: final-system/common/vim.xml introduction/common/changelog.xml materials/common/patches.xml patches.ent

[svn at cross-lfs.org]

Author: jciccone
Date: Mon Jan  5 00:17:30 2009
New Revision: 4327

Log:
Remove  the vim cross-compile patch. It's been fixed enough upstream to rely on config.cache entries.

Modified:
    branches/clfs-sysroot/BOOK/final-system/common/vim.xml
    branches/clfs-sysroot/BOOK/introduction/common/changelog.xml
    branches/clfs-sysroot/BOOK/materials/common/patches.xml
    branches/clfs-sysroot/BOOK/patches.ent

Modified: branches/clfs-sysroot/BOOK/final-system/common/vim.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/vim.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/vim.xml Mon Jan  5 00:17:30 2009
@@ -37,10 +37,18 @@
     and (optionally) <filename>vim-&vim-version;-lang.tar.gz</filename>
     archives into the same directory.</para>
 
-    <para os="p1">The following patch fixes numerous issues with
-    cross-compiling Vim:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&vim-cross_compile-patch;</userinput></screen>
+    <para os="cc1">The configure script is full of logic that aborts at the
+    first sign of cross compiling. Set the cached values of those tests with
+    the following command:</para>
+
+<screen os="cc2"><userinput>echo "vim_cv_getcwd_broken=no" > src/auto/config.cache
+echo "vim_cv_memmove_handles_overlap=yes" >> src/auto/config.cache
+echo "vim_cv_stat_ignores_slash=no" >> src/auto/config.cache
+echo "vim_cv_terminfo=yes" >> src/auto/config.cache
+echo "vim_cv_tgent=zero" >> src/auto/config.cache
+echo "vim_cv_toupper_broken=no" >> src/auto/config.cache
+echo "vim_cv_tty_group=world" >> src/auto/config.cache
+echo "ac_cv_sizeof_int=4" >> src/auto/config.cache</userinput></screen>
 
     <para os="b">Change the default location of
     the <filename>vimrc</filename> configuration file to <filename

Modified: branches/clfs-sysroot/BOOK/introduction/common/changelog.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/introduction/common/changelog.xml (original)
+++ branches/clfs-sysroot/BOOK/introduction/common/changelog.xml Mon Jan  5 00:17:30 2009
@@ -39,6 +39,11 @@
     <listitem>
       <para>Janurary 04, 2009</para>
       <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Removed the vim cross-compile patch. It has been
+          sufficiently fixed upstream that so that config.cache entries are
+          enough.</para>
+        </listitem>
         <listitem>
           <para>[jciccone] - Various Compilation fixes for the entire book.</para>
         </listitem>

Modified: branches/clfs-sysroot/BOOK/materials/common/patches.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/materials/common/patches.xml (original)
+++ branches/clfs-sysroot/BOOK/materials/common/patches.xml Mon Jan  5 00:17:30 2009
@@ -145,15 +145,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Vim Cross-Compile Patch - <token>&vim-cross_compile-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&vim-cross_compile-patch;"/></para>
-        <para>MD5 sum: <literal>&vim-cross_compile-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Zlib fPIC Patch - <token>&zlib-fpic-patch-size;</token>:</term> <listitem>
         <para>Download: <ulink
         url="&patches-root;&zlib-fpic-patch;"/></para>

Modified: branches/clfs-sysroot/BOOK/patches.ent
==============================================================================
--- branches/clfs-sysroot/BOOK/patches.ent (original)
+++ branches/clfs-sysroot/BOOK/patches.ent Mon Jan  5 00:17:30 2009
@@ -60,10 +60,6 @@
 <!ENTITY shadow-sysroot_hacks-patch-md5 "cf5095a86c666728650e77f1cdc64874">
 <!ENTITY shadow-sysroot_hacks-patch-size "36 KB">
 
-<!ENTITY vim-cross_compile-patch "vim-&vim-version;-cross_compile-1.patch">
-<!ENTITY vim-cross_compile-patch-md5 "f8af7a628b58959914390783932c23bc">
-<!ENTITY vim-cross_compile-patch-size "28 KB">
-
 <!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-1.patch">
 <!ENTITY zlib-fpic-patch-md5 "545d60b20bfde6f53023de44438cef59">
 <!ENTITY zlib-fpic-patch-size "3.2 KB">