patch 7.4.1733

Problem:    "make install" doesn't know about cross-compiling. (Christian
            Neukirchen)
Solution:   Add CROSS_COMPILING. (closes #740)

diff --git a/src/Makefile b/src/Makefile
index cf9636d526e414c61ba0880ce56b7713d4591a66..195cbd5c64d54195105aed76d8f56e4e138d68bb 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1998,23 +1998,25 @@ test1 \
        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:
+       test100 test101 test102 test103 test104 test107 test108:
        cd testdir; rm -f $@.out; $(MAKE) -f Makefile $@.out 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_expr \
        test_expand \
+       test_expr \
        test_feedkeys \
        test_file_perm \
+       test_fnamemodify \
        test_glob2regpat \
        test_hardcopy \
        test_help_tagjump \
@@ -2024,17 +2026,22 @@ test_arglist \
        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,6 +2049,8 @@ test_arglist \
        test_viml \
        test_visual \
        test_window_id \
+       test_alot_latin \
+       test_alot_utf8 \
        test_alot:
        cd testdir; rm -f $@.res test.log messages; $(MAKE) -f Makefile $@.res VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
        @if test -f testdir/test.log; then \
@@ -2126,9 +2135,11 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(DEST_RT) \
 # 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
+       cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)" -a -f tags; then \
+               mv -f tags tags.dist; fi
        @echo generating help tags
-       -@cd $(HELPSOURCE); $(MAKE) VIMEXE=$(DEST_BIN)/$(VIMTARGET) vimtags
+       -@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`"; \

diff --git a/src/auto/configure b/src/auto/configure
index a7082300bda41be26a1b044521dad80f803efe7c..91b075d95a8d08f0131599e71931395ee261969a 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -721,6 +721,7 @@ OS_EXTRA_OBJ
 OS_EXTRA_SRC
 XCODE_SELECT
 CPP_MM
+CROSS_COMPILING
 STRIP
 AWK
 FGREP
@@ -4113,11 +4114,14 @@ else
 $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

diff --git a/src/config.mk.in b/src/config.mk.in
index 7c0726c296ffe64a4c5987e6a5f77f1bfe90abbd..1002d7c7c33061b8639fc6693bc2e5a28f211468 100644 (file)
--- a/src/config.mk.in
+++ b/src/config.mk.in
@@ -104,6 +104,7 @@ AWK         = @AWK@
 STRIP          = @STRIP@
 
 EXEEXT         = @EXEEXT@
+CROSS_COMPILING = @CROSS_COMPILING@
 
 COMPILEDBY     = @compiledby@
 

diff --git a/src/configure.in b/src/configure.in
index f29b62c1f9b8b76e9669e52e224e46058e8bb1a1..0a8c95bc6eb4c0dc1a1d46fcc2c43eeb24120eb6 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -88,9 +88,12 @@ fi
 
 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.

diff --git a/src/version.c b/src/version.c
index f1dbb6168a8510983c45b14ac17fe615d2b65053..873f21c2bcbc1168cb38947f281498a153ff8926 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1733,
 /**/
     1732,
 /**/