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