|
 |
6aa307c |
To: vim_dev@googlegroups.com
|
|
|
6aa307c |
Subject: Patch 7.4.068
|
|
|
6aa307c |
Fcc: outbox
|
|
|
6aa307c |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
6aa307c |
Mime-Version: 1.0
|
|
|
6aa307c |
Content-Type: text/plain; charset=UTF-8
|
|
|
6aa307c |
Content-Transfer-Encoding: 8bit
|
|
|
6aa307c |
------------
|
|
|
6aa307c |
|
|
|
6aa307c |
Patch 7.4.068
|
|
|
6aa307c |
Problem: Cannot build Vim on Mac with non-Apple compilers.
|
|
|
6aa307c |
Solution: Remove the -no-cpp-precomp flag. (Misty De Meo)
|
|
|
6aa307c |
Files: src/configure.in, src/auto/configure, src/osdef.sh
|
|
|
6aa307c |
|
|
|
6aa307c |
|
|
|
6aa307c |
*** ../vim-7.4.067/src/configure.in 2013-11-03 20:26:26.000000000 +0100
|
|
|
6aa307c |
--- src/configure.in 2013-11-04 04:53:51.000000000 +0100
|
|
|
6aa307c |
***************
|
|
|
6aa307c |
*** 204,210 ****
|
|
|
6aa307c |
OS_EXTRA_SRC="os_macosx.m os_mac_conv.c";
|
|
|
6aa307c |
OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
|
|
|
6aa307c |
dnl TODO: use -arch i386 on Intel machines
|
|
|
6aa307c |
! CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp"
|
|
|
6aa307c |
|
|
|
6aa307c |
dnl If Carbon is found, assume we don't want X11
|
|
|
6aa307c |
dnl unless it was specifically asked for (--with-x)
|
|
|
6aa307c |
--- 204,211 ----
|
|
|
6aa307c |
OS_EXTRA_SRC="os_macosx.m os_mac_conv.c";
|
|
|
6aa307c |
OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
|
|
|
6aa307c |
dnl TODO: use -arch i386 on Intel machines
|
|
|
6aa307c |
! dnl Removed -no-cpp-precomp, only for very old compilers.
|
|
|
6aa307c |
! CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX"
|
|
|
6aa307c |
|
|
|
6aa307c |
dnl If Carbon is found, assume we don't want X11
|
|
|
6aa307c |
dnl unless it was specifically asked for (--with-x)
|
|
|
6aa307c |
***************
|
|
|
6aa307c |
*** 262,269 ****
|
|
|
6aa307c |
])
|
|
|
6aa307c |
if test "$GCC" = yes -a "$local_dir" != no; then
|
|
|
6aa307c |
echo 'void f(){}' > conftest.c
|
|
|
6aa307c |
! dnl -no-cpp-precomp is needed for OS X 10.2 (Ben Fowler)
|
|
|
6aa307c |
! have_local_include=`${CC-cc} -no-cpp-precomp -c -v conftest.c 2>&1 | grep "${local_dir}/include"`
|
|
|
6aa307c |
have_local_lib=`${CC-cc} -c -v conftest.c 2>&1 | grep "${local_dir}/lib"`
|
|
|
6aa307c |
rm -f conftest.c conftest.o
|
|
|
6aa307c |
fi
|
|
|
6aa307c |
--- 263,270 ----
|
|
|
6aa307c |
])
|
|
|
6aa307c |
if test "$GCC" = yes -a "$local_dir" != no; then
|
|
|
6aa307c |
echo 'void f(){}' > conftest.c
|
|
|
6aa307c |
! dnl Removed -no-cpp-precomp, only needed for OS X 10.2 (Ben Fowler)
|
|
|
6aa307c |
! have_local_include=`${CC-cc} -c -v conftest.c 2>&1 | grep "${local_dir}/include"`
|
|
|
6aa307c |
have_local_lib=`${CC-cc} -c -v conftest.c 2>&1 | grep "${local_dir}/lib"`
|
|
|
6aa307c |
rm -f conftest.c conftest.o
|
|
|
6aa307c |
fi
|
|
|
6aa307c |
*** ../vim-7.4.067/src/auto/configure 2013-11-03 20:26:27.000000000 +0100
|
|
|
6aa307c |
--- src/auto/configure 2013-11-04 04:54:16.000000000 +0100
|
|
|
6aa307c |
***************
|
|
|
6aa307c |
*** 4221,4227 ****
|
|
|
6aa307c |
MACOSX=yes
|
|
|
6aa307c |
OS_EXTRA_SRC="os_macosx.m os_mac_conv.c";
|
|
|
6aa307c |
OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
|
|
|
6aa307c |
! CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp"
|
|
|
6aa307c |
|
|
|
6aa307c |
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
|
|
|
6aa307c |
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
|
|
|
6aa307c |
--- 4221,4227 ----
|
|
|
6aa307c |
MACOSX=yes
|
|
|
6aa307c |
OS_EXTRA_SRC="os_macosx.m os_mac_conv.c";
|
|
|
6aa307c |
OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
|
|
|
6aa307c |
! CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX"
|
|
|
6aa307c |
|
|
|
6aa307c |
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
|
|
|
6aa307c |
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
|
|
|
6aa307c |
***************
|
|
|
6aa307c |
*** 4311,4317 ****
|
|
|
6aa307c |
|
|
|
6aa307c |
if test "$GCC" = yes -a "$local_dir" != no; then
|
|
|
6aa307c |
echo 'void f(){}' > conftest.c
|
|
|
6aa307c |
! have_local_include=`${CC-cc} -no-cpp-precomp -c -v conftest.c 2>&1 | grep "${local_dir}/include"`
|
|
|
6aa307c |
have_local_lib=`${CC-cc} -c -v conftest.c 2>&1 | grep "${local_dir}/lib"`
|
|
|
6aa307c |
rm -f conftest.c conftest.o
|
|
|
6aa307c |
fi
|
|
|
6aa307c |
--- 4311,4317 ----
|
|
|
6aa307c |
|
|
|
6aa307c |
if test "$GCC" = yes -a "$local_dir" != no; then
|
|
|
6aa307c |
echo 'void f(){}' > conftest.c
|
|
|
6aa307c |
! have_local_include=`${CC-cc} -c -v conftest.c 2>&1 | grep "${local_dir}/include"`
|
|
|
6aa307c |
have_local_lib=`${CC-cc} -c -v conftest.c 2>&1 | grep "${local_dir}/lib"`
|
|
|
6aa307c |
rm -f conftest.c conftest.o
|
|
|
6aa307c |
fi
|
|
|
6aa307c |
*** ../vim-7.4.067/src/osdef.sh 2010-05-15 13:04:08.000000000 +0200
|
|
|
6aa307c |
--- src/osdef.sh 2013-11-04 04:51:36.000000000 +0100
|
|
|
6aa307c |
***************
|
|
|
6aa307c |
*** 47,57 ****
|
|
|
6aa307c |
#endif
|
|
|
6aa307c |
EOF
|
|
|
6aa307c |
|
|
|
6aa307c |
! # Mac uses precompiled headers, but we need real headers here.
|
|
|
6aa307c |
! case `uname` in
|
|
|
6aa307c |
! Darwin) $CC -I. -I$srcdir -E -no-cpp-precomp osdef0.c >osdef0.cc;;
|
|
|
6aa307c |
! *) $CC -I. -I$srcdir -E osdef0.c >osdef0.cc;;
|
|
|
6aa307c |
! esac
|
|
|
6aa307c |
|
|
|
6aa307c |
# insert a space in front of each line, so that a function name at the
|
|
|
6aa307c |
# start of the line is matched with "[)*, ]\1[ (]"
|
|
|
6aa307c |
--- 47,53 ----
|
|
|
6aa307c |
#endif
|
|
|
6aa307c |
EOF
|
|
|
6aa307c |
|
|
|
6aa307c |
! $CC -I. -I$srcdir -E osdef0.c >osdef0.cc
|
|
|
6aa307c |
|
|
|
6aa307c |
# insert a space in front of each line, so that a function name at the
|
|
|
6aa307c |
# start of the line is matched with "[)*, ]\1[ (]"
|
|
|
6aa307c |
*** ../vim-7.4.067/src/version.c 2013-11-04 04:20:28.000000000 +0100
|
|
|
6aa307c |
--- src/version.c 2013-11-04 04:51:51.000000000 +0100
|
|
|
6aa307c |
***************
|
|
|
6aa307c |
*** 740,741 ****
|
|
|
6aa307c |
--- 740,743 ----
|
|
|
6aa307c |
{ /* Add new patch number below this line */
|
|
|
6aa307c |
+ /**/
|
|
|
6aa307c |
+ 68,
|
|
|
6aa307c |
/**/
|
|
|
6aa307c |
|
|
|
6aa307c |
--
|
|
|
6aa307c |
Violators can be fined, arrested or jailed for making ugly faces at a dog.
|
|
|
6aa307c |
[real standing law in Oklahoma, United States of America]
|
|
|
6aa307c |
|
|
|
6aa307c |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
6aa307c |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
6aa307c |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
6aa307c |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|