Changeset 229ed25 for BOOK/temp-system/common/vim.xml

Timestamp:

Jan 4, 2014, 12:03:38 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f90d077

Parents:

ec008670 (diff), e57ce38 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:

• BOOK/temp-system/common/vim.xml (modified) (2 diffs)

BOOK/temp-system/common/vim.xml

@@ -31 +31 @@
     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
     that aborts at the first sign of cross compiling. Work around this by
@@ -47 +41 @@
 vim_cv_stat_ignores_slash=no
 vim_cv_terminfo=yes
-vim_cv_tgent=zero
 vim_cv_toupper_broken=no
 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>