1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
|
From ff1f017e5ab049557896655535e7d79663f89262 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 14 Apr 2016 16:46:02 +0200
Subject: [PATCH] patch 7.4.1733
Problem: "make install" doesn't know about cross-compiling. (Christian
Neukirchen)
Solution: Add CROSS_COMPILING. (closes #740)
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Upstream-status: Backport
---
src/Makefile | 19 +++++++++++++++----
src/auto/configure | 4 ++++
src/config.mk.in | 1 +
src/configure.in | 3 +++
src/version.c | 2 ++
5 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index cf9636d..195cbd5 100644
--- 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 a708230..91b075d 100755
--- 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 7c0726c..1002d7c 100644
--- 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 f29b62c..0a8c95b 100644
--- 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 8d32e2a..f0630ea 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1733,
+/**/
1689,
/**/
1688,
--
2.1.4
|
