Patch 7.4.1733
Problem: "make install" doesn't know about cross-compiling. (Christian
Neukirchen)
Solution: Add CROSS_COMPILING. (closes #740)
Files: src/configure.in, src/auto/configure, src/config.mk.in,
src/Makefile
*** ../vim-7.4.1732/src/configure.in 2016-03-11 22:52:00.718438283 +0100
--- src/configure.in 2016-04-14 16:34:03.837631817 +0200
***************
*** 88,96 ****
--- 88,99 ----
dnl If configure thinks we are cross compiling, there might be something
dnl wrong with the CC or CFLAGS settings, give a useful warning message
+ CROSS_COMPILING=
if test "$cross_compiling" = yes; then
AC_MSG_RESULT([cannot compile a simple program; if not cross compiling
check CC and CFLAGS])
+ CROSS_COMPILING=1
fi
+ AC_SUBST(CROSS_COMPILING)
dnl gcc-cpp has the wonderful -MM option to produce nicer dependencies.
dnl But gcc 3.1 changed the meaning! See near the end.
*** ../vim-7.4.1732/src/auto/configure 2016-03-11 22:52:00.726438199 +0100
--- src/auto/configure 2016-04-14 16:39:15.622390119 +0200
***************
*** 721,726 ****
--- 721,727 ----
OS_EXTRA_SRC
XCODE_SELECT
CPP_MM
+ CROSS_COMPILING
STRIP
AWK
FGREP
***************
*** 4113,4123 ****
--- 4114,4127 ----
$as_echo "no" >&6; }
fi
+ CROSS_COMPILING=
if test "$cross_compiling" = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot compile a simple
program; if not cross compiling check CC and CFLAGS" >&5
$as_echo "cannot compile a simple program; if not cross compiling check CC
and CFLAGS" >&6; }
+ CROSS_COMPILING=1
fi
+
test "$GCC" = yes && CPP_MM=M;
if test -f ./toolcheck; then
*** ../vim-7.4.1732/src/config.mk.in 2016-02-27 18:13:05.248592984 +0100
--- src/config.mk.in 2016-04-14 16:36:20.836207592 +0200
***************
*** 104,109 ****
--- 104,110 ----
STRIP = @STRIP@
EXEEXT = @EXEEXT@
+ CROSS_COMPILING = @CROSS_COMPILING@
COMPILEDBY = @compiledby@
*** ../vim-7.4.1732/src/Makefile 2016-03-25 17:00:22.095689560 +0100
--- src/Makefile 2016-04-14 16:39:04.398506840 +0200
***************
*** 1998,2020 ****
test70 test71 test72 test73 test74 test75 test76 test77 test78 test79 \
test80 test81 test82 test83 test84 test85 test86 test87 test88 test89 \
test90 test91 test92 test93 test94 test95 test97 test98 test99 \
! test100 test101 test102 test103 test104 test105 test107 test108:
cd testdir; rm -f [email protected]; $(MAKE) -f Makefile [email protected]
VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
# Run individual NEW style test, assuming that Vim was already compiled.
test_arglist \
test_assert \
test_assign \
test_backspace_opt \
test_cdo \
test_channel \
test_cursor_func \
test_delete \
test_ex_undo \
- test_expr \
test_expand \
test_feedkeys \
test_file_perm \
test_glob2regpat \
test_hardcopy \
test_help_tagjump \
--- 1998,2022 ----
test70 test71 test72 test73 test74 test75 test76 test77 test78 test79 \
test80 test81 test82 test83 test84 test85 test86 test87 test88 test89 \
test90 test91 test92 test93 test94 test95 test97 test98 test99 \
! test100 test101 test102 test103 test104 test107 test108:
cd testdir; rm -f [email protected]; $(MAKE) -f Makefile [email protected]
VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
# Run individual NEW style test, assuming that Vim was already compiled.
test_arglist \
test_assert \
test_assign \
+ test_autocmd \
test_backspace_opt \
test_cdo \
test_channel \
test_cursor_func \
test_delete \
test_ex_undo \
test_expand \
+ test_expr \
test_feedkeys \
test_file_perm \
+ test_fnamemodify \
test_glob2regpat \
test_hardcopy \
test_help_tagjump \
***************
*** 2024,2040 ****
--- 2026,2047 ----
test_json \
test_langmap \
test_lispwords \
+ test_matchstrpos \
test_menu \
test_packadd \
test_partial \
test_perl \
test_quickfix \
+ test_regexp_latin \
+ test_regexp_utf8 \
test_reltime \
test_searchpos \
test_set \
test_sort \
+ test_statusline \
test_syn_attr \
test_syntax \
+ test_tabline \
test_timers \
test_undolevels \
test_unlet \
***************
*** 2042,2047 ****
--- 2049,2056 ----
test_viml \
test_visual \
test_window_id \
+ test_alot_latin \
+ test_alot_utf8 \
test_alot:
cd testdir; rm -f [email protected] test.log messages; $(MAKE) -f Makefile [email protected]
VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
@if test -f testdir/test.log; then \
***************
*** 2126,2134 ****
# Generate the help tags with ":helptags" to handle all languages.
# Move the distributed tags file aside and restore it, to avoid it being
# different from the repository.
! cd $(HELPSOURCE); if test -f tags; then mv -f tags tags.dist; fi
@echo generating help tags
! -@cd $(HELPSOURCE); $(MAKE) VIMEXE=$(DEST_BIN)/$(VIMTARGET) vimtags
cd $(HELPSOURCE); \
files=`ls *.txt tags`; \
files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \
--- 2135,2145 ----
# Generate the help tags with ":helptags" to handle all languages.
# Move the distributed tags file aside and restore it, to avoid it being
# different from the repository.
! cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)" -a -f tags; then \
! mv -f tags tags.dist; fi
@echo generating help tags
! -@cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)"; then \
! $(MAKE) VIMEXE=$(DEST_BIN)/$(VIMTARGET) vimtags; fi
cd $(HELPSOURCE); \
files=`ls *.txt tags`; \
files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \
*** ../vim-7.4.1732/src/version.c 2016-04-14 16:22:01.165150920 +0200
--- src/version.c 2016-04-14 16:35:17.236868801 +0200
***************
*** 750,751 ****
--- 750,753 ----
{ /* Add new patch number below this line */
+ /**/
+ 1733,
/**/
--
Bravely bold Sir Robin, rode forth from Camelot,
He was not afraid to die, Oh Brave Sir Robin,
He was not at all afraid to be killed in nasty ways
Brave, brave, brave, brave Sir Robin.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
