1 |
polynomial-c 13/12/05 08:13:52 |
2 |
|
3 |
Added: git-1.8.5-optional-cvs.patch |
4 |
Removed: git-1.7.2-always-install-js.patch |
5 |
git-1.7.3.5-optional-cvs.patch |
6 |
git-1.7.11-optional-cvs.patch |
7 |
git-1.6.6.1-interix6.patch |
8 |
git-1.7.3.4-avoid-shell-issues.patch |
9 |
git-1.7.3.4-fix-perl-test-prereq.patch |
10 |
git-1.7.3.2-interix.patch git-1.7.1-interix.patch |
11 |
Log: |
12 |
Version bump. Removed old |
13 |
|
14 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC) |
15 |
|
16 |
Revision Changes Path |
17 |
1.1 dev-vcs/git/files/git-1.8.5-optional-cvs.patch |
18 |
|
19 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/files/git-1.8.5-optional-cvs.patch?rev=1.1&view=markup |
20 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/files/git-1.8.5-optional-cvs.patch?rev=1.1&content-type=text/plain |
21 |
|
22 |
Index: git-1.8.5-optional-cvs.patch |
23 |
=================================================================== |
24 |
From eadb20b065c33d46b49c8c95d8cde0c9fe7c62a4 Mon Sep 17 00:00:00 2001 |
25 |
From: Robin Johnson <robbat2@g.o> |
26 |
Date: Wed, 22 Aug 2012 04:25:06 +0000 |
27 |
Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface |
28 |
utilities |
29 |
|
30 |
Forward-ported from 1.7.12 to current git.git v1.8.4 |
31 |
Forward-ported from v1.8.4 to v1.8.5.1 |
32 |
|
33 |
--- git-1.8.5.1/Makefile |
34 |
+++ git-1.8.5.1/Makefile |
35 |
@@ -263,6 +263,8 @@ |
36 |
# |
37 |
# Define NO_TCLTK if you do not want Tcl/Tk GUI. |
38 |
# |
39 |
+# Define NO_CVS if you do not want any CVS interface utilities. |
40 |
+# |
41 |
# The TCL_PATH variable governs the location of the Tcl interpreter |
42 |
# used to optimize git-gui for your system. Only used if NO_TCLTK |
43 |
# is not set. Defaults to the bare 'tclsh'. |
44 |
@@ -437,6 +439,7 @@ |
45 |
PROGRAM_OBJS = |
46 |
PROGRAMS = |
47 |
SCRIPT_PERL = |
48 |
+SCRIPT_PERL_CVS = |
49 |
SCRIPT_PYTHON = |
50 |
SCRIPT_SH = |
51 |
SCRIPT_LIB = |
52 |
@@ -477,20 +480,21 @@ |
53 |
SCRIPT_PERL += git-add--interactive.perl |
54 |
SCRIPT_PERL += git-difftool.perl |
55 |
SCRIPT_PERL += git-archimport.perl |
56 |
-SCRIPT_PERL += git-cvsexportcommit.perl |
57 |
-SCRIPT_PERL += git-cvsimport.perl |
58 |
-SCRIPT_PERL += git-cvsserver.perl |
59 |
SCRIPT_PERL += git-relink.perl |
60 |
SCRIPT_PERL += git-send-email.perl |
61 |
SCRIPT_PERL += git-svn.perl |
62 |
|
63 |
+SCRIPT_PERL_CVS += git-cvsexportcommit.perl |
64 |
+SCRIPT_PERL_CVS += git-cvsimport.perl |
65 |
+SCRIPT_PERL_CVS += git-cvsserver.perl |
66 |
+ |
67 |
SCRIPT_PYTHON += git-p4.py |
68 |
|
69 |
NO_INSTALL += git-remote-testgit |
70 |
|
71 |
# Generated files for scripts |
72 |
SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH)) |
73 |
-SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL)) |
74 |
+SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) |
75 |
SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON)) |
76 |
|
77 |
SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN)) |
78 |
@@ -1779,8 +1783,18 @@ |
79 |
$(join -DMAJOR= -DMINOR= -DPATCH=, $(wordlist 1,3,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \ |
80 |
-DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@ |
81 |
|
82 |
+_SCRIPT_PERL_BUILD = |
83 |
+_SCRIPT_PERL_NOBUILD = |
84 |
+ |
85 |
ifndef NO_PERL |
86 |
-$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak |
87 |
+ |
88 |
+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL) |
89 |
+ |
90 |
+ifndef NO_CVS |
91 |
+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL_CVS) |
92 |
+else # NO_CVS |
93 |
+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL_CVS) |
94 |
+endif # NO_CVS |
95 |
|
96 |
perl/perl.mak: perl/PM.stamp |
97 |
|
98 |
@@ -1792,7 +1806,7 @@ |
99 |
perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL |
100 |
$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F) |
101 |
|
102 |
-$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE |
103 |
+$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl GIT-VERSION-FILE |
104 |
$(QUIET_GEN)$(RM) $@ $@+ && \ |
105 |
INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \ |
106 |
sed -e '1{' \ |
107 |
@@ -1817,14 +1831,17 @@ |
108 |
chmod +x $@+ && \ |
109 |
mv $@+ $@ |
110 |
else # NO_PERL |
111 |
-$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh |
112 |
+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) git-instaweb |
113 |
+endif # NO_PERL |
114 |
+ |
115 |
+# This is any perl scripts that were disabled it might be empty... |
116 |
+$(patsubst %.perl,%,$(_SCRIPT_PERL_NOBUILD)): % : unimplemented.sh |
117 |
$(QUIET_GEN)$(RM) $@ $@+ && \ |
118 |
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ |
119 |
-e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ |
120 |
unimplemented.sh >$@+ && \ |
121 |
chmod +x $@+ && \ |
122 |
mv $@+ $@ |
123 |
-endif # NO_PERL |
124 |
|
125 |
ifndef NO_PYTHON |
126 |
$(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS |
127 |
--- git-1.8.5.1/t/t9200-git-cvsexportcommit.sh |
128 |
+++ git-1.8.5.1/t/t9200-git-cvsexportcommit.sh |
129 |
@@ -12,6 +12,11 @@ |
130 |
test_done |
131 |
fi |
132 |
|
133 |
+if ! test_have_prereq CVS; then |
134 |
+ skip_all='skipping git cvsexportcommit tests, cvs not available' |
135 |
+ test_done |
136 |
+fi |
137 |
+ |
138 |
cvs >/dev/null 2>&1 |
139 |
if test $? -ne 1 |
140 |
then |
141 |
--- git-1.8.5.1/t/t9400-git-cvsserver-server.sh |
142 |
+++ git-1.8.5.1/t/t9400-git-cvsserver-server.sh |
143 |
@@ -11,9 +11,15 @@ |
144 |
. ./test-lib.sh |
145 |
|
146 |
if ! test_have_prereq PERL; then |
147 |
- skip_all='skipping git cvsserver tests, perl not available' |
148 |
+ skip_all='skipping git-cvsserver tests, perl not available' |
149 |
test_done |
150 |
fi |
151 |
+ |
152 |
+if ! test_have_prereq CVS; then |
153 |
+ skip_all='skipping git-cvsserver tests, cvs not available' |
154 |
+ test_done |
155 |
+fi |
156 |
+ |
157 |
cvs >/dev/null 2>&1 |
158 |
if test $? -ne 1 |
159 |
then |
160 |
--- git-1.8.5.1/t/t9401-git-cvsserver-crlf.sh |
161 |
+++ git-1.8.5.1/t/t9401-git-cvsserver-crlf.sh |
162 |
@@ -57,15 +57,20 @@ |
163 |
return $stat |
164 |
} |
165 |
|
166 |
-cvs >/dev/null 2>&1 |
167 |
-if test $? -ne 1 |
168 |
+if ! test_have_prereq PERL |
169 |
then |
170 |
- skip_all='skipping git-cvsserver tests, cvs not found' |
171 |
+ skip_all='skipping git-cvsserver tests, perl not available' |
172 |
test_done |
173 |
fi |
174 |
-if ! test_have_prereq PERL |
175 |
+if ! test_have_prereq CVS |
176 |
then |
177 |
- skip_all='skipping git-cvsserver tests, perl not available' |
178 |
+ skip_all='skipping git-cvsserver tests, cvs not available' |
179 |
+ test_done |
180 |
+fi |
181 |
+cvs >/dev/null 2>&1 |
182 |
+if test $? -ne 1 |
183 |
+then |
184 |
+ skip_all='skipping git-cvsserver tests, cvs not found' |
185 |
test_done |
186 |
fi |
187 |
perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { |
188 |
--- git-1.8.5.1/t/t9600-cvsimport.sh |
189 |
+++ git-1.8.5.1/t/t9600-cvsimport.sh |
190 |
@@ -3,14 +3,25 @@ |
191 |
test_description='git cvsimport basic tests' |
192 |
. ./lib-cvs.sh |
193 |
|
194 |
-test_expect_success PERL 'setup cvsroot environment' ' |
195 |
+if ! test_have_prereq PERL |
196 |
+then |
197 |
+ skip_all='skipping git cvsimport tests, perl not available' |
198 |
+ test_done |
199 |
+fi |
200 |
+if ! test_have_prereq CVS |
201 |
+then |
202 |
+ skip_all='skipping git cvsimport tests, cvs not available' |
203 |
+ test_done |
204 |
+fi |
205 |
+ |
206 |
+test_expect_success 'setup cvsroot environment' ' |
207 |
CVSROOT=$(pwd)/cvsroot && |
208 |
export CVSROOT |
209 |
' |
210 |
|
211 |
-test_expect_success PERL 'setup cvsroot' '$CVS init' |
212 |
+test_expect_success 'setup cvsroot' '$CVS init' |
213 |
|
214 |
-test_expect_success PERL 'setup a cvs module' ' |
215 |
+test_expect_success 'setup a cvs module' ' |
216 |
|
217 |
mkdir "$CVSROOT/module" && |
218 |
$CVS co -d module-cvs module && |
219 |
@@ -42,23 +53,23 @@ |
220 |
) |
221 |
' |
222 |
|
223 |
-test_expect_success PERL 'import a trivial module' ' |
224 |
+test_expect_success 'import a trivial module' ' |
225 |
|
226 |
git cvsimport -a -R -z 0 -C module-git module && |
227 |
test_cmp module-cvs/o_fortuna module-git/o_fortuna |
228 |
|
229 |
' |
230 |
|
231 |
-test_expect_success PERL 'pack refs' '(cd module-git && git gc)' |
232 |
+test_expect_success 'pack refs' '(cd module-git && git gc)' |
233 |
|
234 |
-test_expect_success PERL 'initial import has correct .git/cvs-revisions' ' |
235 |
+test_expect_success 'initial import has correct .git/cvs-revisions' ' |
236 |
|
237 |
(cd module-git && |
238 |
git log --format="o_fortuna 1.1 %H" -1) > expected && |
239 |
test_cmp expected module-git/.git/cvs-revisions |
240 |
' |
241 |
|
242 |
-test_expect_success PERL 'update cvs module' ' |
243 |
+test_expect_success 'update cvs module' ' |
244 |
(cd module-cvs && |
245 |
cat <<EOF >o_fortuna && |
246 |
O Fortune, |
247 |
@@ -86,7 +97,7 @@ |
248 |
) |
249 |
' |
250 |
|
251 |
-test_expect_success PERL 'update git module' ' |
252 |
+test_expect_success 'update git module' ' |
253 |
|
254 |
(cd module-git && |
255 |
git config cvsimport.trackRevisions true && |
256 |
@@ -97,7 +108,7 @@ |
257 |
|
258 |
' |
259 |
|
260 |
-test_expect_success PERL 'update has correct .git/cvs-revisions' ' |
261 |
+test_expect_success 'update has correct .git/cvs-revisions' ' |
262 |
|
263 |
(cd module-git && |
264 |
git log --format="o_fortuna 1.1 %H" -1 HEAD^ && |
265 |
@@ -105,7 +116,7 @@ |
266 |
test_cmp expected module-git/.git/cvs-revisions |
267 |
' |
268 |
|
269 |
-test_expect_success PERL 'update cvs module' ' |
270 |
+test_expect_success 'update cvs module' ' |
271 |
|
272 |
(cd module-cvs && |
273 |
echo 1 >tick && |
274 |
@@ -114,7 +125,7 @@ |
275 |
) |
276 |
' |
277 |
|
278 |
-test_expect_success PERL 'cvsimport.module config works' ' |
279 |
+test_expect_success 'cvsimport.module config works' ' |
280 |
|
281 |
(cd module-git && |
282 |
git config cvsimport.module module && |
283 |
@@ -126,7 +137,7 @@ |
284 |
|
285 |
' |
286 |
|
287 |
-test_expect_success PERL 'second update has correct .git/cvs-revisions' ' |
288 |
+test_expect_success 'second update has correct .git/cvs-revisions' ' |
289 |
|
290 |
(cd module-git && |
291 |
git log --format="o_fortuna 1.1 %H" -1 HEAD^^ && |
292 |
@@ -135,7 +146,7 @@ |
293 |
test_cmp expected module-git/.git/cvs-revisions |
294 |
' |
295 |
|
296 |
-test_expect_success PERL 'import from a CVS working tree' ' |
297 |
+test_expect_success 'import from a CVS working tree' ' |
298 |
|
299 |
$CVS co -d import-from-wt module && |
300 |
(cd import-from-wt && |
301 |
@@ -148,12 +159,12 @@ |
302 |
|
303 |
' |
304 |
|
305 |
-test_expect_success PERL 'no .git/cvs-revisions created by default' ' |
306 |
+test_expect_success 'no .git/cvs-revisions created by default' ' |
307 |
|
308 |
! test -e import-from-wt/.git/cvs-revisions |
309 |
|
310 |
' |
311 |
|
312 |
-test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master' |
313 |
+test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master' |
314 |
|
315 |
test_done |
316 |
--- git-1.8.5.1/t/t9601-cvsimport-vendor-branch.sh |
317 |
+++ git-1.8.5.1/t/t9601-cvsimport-vendor-branch.sh |
318 |
@@ -34,6 +34,17 @@ |
319 |
test_description='git cvsimport handling of vendor branches' |
320 |
. ./lib-cvs.sh |
321 |
|
322 |
+if ! test_have_prereq PERL |
323 |
+then |
324 |
+ skip_all='skipping git cvsimport tests, perl not available' |
325 |
+ test_done |
326 |
+fi |
327 |
+if ! test_have_prereq CVS |
328 |
+then |
329 |
+ skip_all='skipping git cvsimport tests, cvs not available' |
330 |
+ test_done |
331 |
+fi |
332 |
+ |
333 |
setup_cvs_test_repository t9601 |
334 |
|
335 |
test_expect_success PERL 'import a module with a vendor branch' ' |
336 |
--- git-1.8.5.1/t/t9602-cvsimport-branches-tags.sh |
337 |
+++ git-1.8.5.1/t/t9602-cvsimport-branches-tags.sh |
338 |
@@ -6,6 +6,17 @@ |
339 |
test_description='git cvsimport handling of branches and tags' |
340 |
. ./lib-cvs.sh |
341 |
|
342 |
+if ! test_have_prereq PERL |
343 |
+then |
344 |
+ skip_all='skipping git cvsimport tests, perl not available' |
345 |
+ test_done |
346 |
+fi |
347 |
+if ! test_have_prereq CVS |
348 |
+then |
349 |
+ skip_all='skipping git cvsimport tests, cvs not available' |
350 |
+ test_done |
351 |
+fi |
352 |
+ |
353 |
setup_cvs_test_repository t9602 |
354 |
|
355 |
test_expect_success PERL 'import module' ' |
356 |
--- git-1.8.5.1/t/t9603-cvsimport-patchsets.sh |
357 |
+++ git-1.8.5.1/t/t9603-cvsimport-patchsets.sh |
358 |
@@ -14,6 +14,17 @@ |
359 |
test_description='git cvsimport testing for correct patchset estimation' |
360 |
. ./lib-cvs.sh |
361 |
|
362 |
+if ! test_have_prereq PERL |
363 |
+then |
364 |
+ skip_all='skipping git cvsimport tests, perl not available' |
365 |
+ test_done |
366 |
+fi |
367 |
+if ! test_have_prereq CVS |
368 |
+then |
369 |
+ skip_all='skipping git cvsimport tests, cvs not available' |
370 |
+ test_done |
371 |
+fi |
372 |
+ |
373 |
setup_cvs_test_repository t9603 |
374 |
|
375 |
test_expect_failure 'import with criss cross times on revisions' ' |
376 |
--- git-1.8.5.1/t/test-lib.sh |
377 |
+++ git-1.8.5.1/t/test-lib.sh |
378 |
@@ -772,6 +772,7 @@ |
379 |
esac |
380 |
|
381 |
( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1 |
382 |
+test -z "$NO_CVS" && test_set_prereq CVS |
383 |
test -z "$NO_PERL" && test_set_prereq PERL |
384 |
test -z "$NO_PYTHON" && test_set_prereq PYTHON |
385 |
test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE |