Changeset 6c5a343 for BOOK/temp-system

Timestamp:

Jan 8, 2011, 6:31:49 PM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

500e787

Parents:

f42e5c1

git-author:

Joe Ciccone <jciccone@…> (01/08/11 18:08:11)

git-committer:

Joe Ciccone <jciccone@…> (01/08/11 18:31:49)

Message:

Update Vim to 7.3.

Location:

BOOK/temp-system

Files:

• common/vim.xml (modified) (4 diffs)
• multilib/vim.xml (modified) (3 diffs)

BOOK/temp-system/common/vim.xml

@@ -25 +25 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/vim.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/vim.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
@@ -34 +30 @@
     href="../../final-system/common/vim.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+
+    <para os="s1">The configure script has a single hard coded test that
+    cannot be bypassed with a cache entry. Disable this test with the
+    following command:</para>
+
+<screen os="s2"><userinput>sed -i "/using uint32_t/s/as_fn_error/#&amp;/" src/auto/configure</userinput></screen>
 
     <para os="c1">The <command>configure</command> script is full of logic
@@ -49 +51 @@
 vim_cv_tty_group=world
 ac_cv_sizeof_int=4
+ac_cv_sizeof_long=4
+ac_cv_sizeof_time_t=4
+ac_cv_sizeof_off_t=4
 EOF</userinput></screen>
 
@@ -61 +66 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="e"><userinput>CPPFLAGS="-DUNUSED=" ./configure \
+<screen os="e"><userinput>./configure \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --prefix=/tools --enable-multibyte --enable-gui=no \

BOOK/temp-system/multilib/vim.xml

@@ -25 +25 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/vim.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
@@ -34 +30 @@
     href="../common/vim.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -55 +59 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="e"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" CPPFLAGS="-DUNUSED=" \
+<screen os="e"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
   ./configure --build=${CLFS_HOST} --host=${CLFS_TARGET} \
   --prefix=/tools --enable-multibyte --enable-gui=no \