Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/
Date: Sun, 06 Aug 2017 00:12:30
Message-Id: 1501978340.541e9759ca8143d7e446de7cc353417dd45f5a71.robbat2@gentoo
1 commit: 541e9759ca8143d7e446de7cc353417dd45f5a71
2 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 6 00:04:59 2017 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 6 00:12:20 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=541e9759
7
8 dev-vcs/git: switch to PCRE2-JIT per upstream.
9
10 Upstream Git is switching to PCRE2 w/ JIT by default, because of the
11 performance boost. An optional non-JIT PCRE is available in PCRE1 code
12 path, for arches where dev-libs/libpcre2[jit] is not available (alpha,
13 ia64, hppa as of this commit).
14
15 Closes: https://bugs.gentoo.org/show_bug.cgi?id=627088
16 Bug: https://bugs.gentoo.org/show_bug.cgi?id=627088
17 Package-Manager: portage-2.3.6
18
19 .../git/{git-2.14.0.ebuild => git-2.14.0-r1.ebuild} | 21 ++++++++++++++++-----
20 dev-vcs/git/git-2.14.0.ebuild | 2 +-
21 dev-vcs/git/git-9999-r1.ebuild | 21 ++++++++++++++++-----
22 dev-vcs/git/git-9999-r2.ebuild | 21 ++++++++++++++++-----
23 dev-vcs/git/git-9999-r3.ebuild | 21 ++++++++++++++++-----
24 dev-vcs/git/git-9999.ebuild | 21 ++++++++++++++++-----
25 dev-vcs/git/metadata.xml | 1 +
26 7 files changed, 82 insertions(+), 26 deletions(-)
27
28 diff --git a/dev-vcs/git/git-2.14.0.ebuild b/dev-vcs/git/git-2.14.0-r1.ebuild
29 similarity index 97%
30 copy from dev-vcs/git/git-2.14.0.ebuild
31 copy to dev-vcs/git/git-2.14.0-r1.ebuild
32 index 2b0d92a449d..492ea3ac973 100644
33 --- a/dev-vcs/git/git-2.14.0.ebuild
34 +++ b/dev-vcs/git/git-2.14.0-r1.ebuild
35 @@ -43,7 +43,7 @@ fi
36
37 LICENSE="GPL-2"
38 SLOT="0"
39 -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
40 +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
41
42 # Common to both DEPEND and RDEPEND
43 CDEPEND="
44 @@ -51,7 +51,10 @@ CDEPEND="
45 !libressl? ( dev-libs/openssl:0= )
46 libressl? ( dev-libs/libressl:= )
47 sys-libs/zlib
48 - pcre? ( dev-libs/libpcre )
49 + pcre? (
50 + pcre-jit? ( dev-libs/libpcre2[jit(+)] )
51 + !pcre-jit? ( dev-libs/libpcre[-jit(-)] )
52 + )
53 perl? ( dev-lang/perl:=[-build(-)] )
54 tk? ( dev-lang/tk:0= )
55 curl? (
56 @@ -108,6 +111,7 @@ REQUIRED_USE="
57 mediawiki-experimental? ( mediawiki )
58 subversion? ( perl )
59 webdav? ( curl )
60 + pcre-jit? ( pcre )
61 python? ( ${PYTHON_REQUIRED_USE} )
62 "
63
64 @@ -173,9 +177,16 @@ exportmakeopts() {
65 || myopts+=" NO_GETTEXT=YesPlease"
66 use tk \
67 || myopts+=" NO_TCLTK=YesPlease"
68 - use pcre \
69 - && myopts+=" USE_LIBPCRE=yes" \
70 - && extlibs+=" -lpcre"
71 + if use pcre; then
72 + if use pcre-jit; then
73 + myopts+=" USE_LIBPCRE2=YesPlease"
74 + extlibs+=" -lpcre2-8"
75 + else
76 + myopts+=" USE_LIBPCRE1=YesPlease"
77 + myopts+=" NO_LIBPCRE1_JIT=YesPlease"
78 + extlibs+=" -lpcre"
79 + fi
80 + fi
81 use perl \
82 && myopts+=" INSTALLDIRS=vendor" \
83 || myopts+=" NO_PERL=YesPlease"
84
85 diff --git a/dev-vcs/git/git-2.14.0.ebuild b/dev-vcs/git/git-2.14.0.ebuild
86 index 2b0d92a449d..5d492f0abc0 100644
87 --- a/dev-vcs/git/git-2.14.0.ebuild
88 +++ b/dev-vcs/git/git-2.14.0.ebuild
89 @@ -174,7 +174,7 @@ exportmakeopts() {
90 use tk \
91 || myopts+=" NO_TCLTK=YesPlease"
92 use pcre \
93 - && myopts+=" USE_LIBPCRE=yes" \
94 + && myopts+=" USE_LIBPCRE1=yes" \
95 && extlibs+=" -lpcre"
96 use perl \
97 && myopts+=" INSTALLDIRS=vendor" \
98
99 diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
100 index e61e4dbc350..d5d419248fd 100644
101 --- a/dev-vcs/git/git-9999-r1.ebuild
102 +++ b/dev-vcs/git/git-9999-r1.ebuild
103 @@ -43,7 +43,7 @@ fi
104
105 LICENSE="GPL-2"
106 SLOT="0"
107 -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
108 +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
109
110 # Common to both DEPEND and RDEPEND
111 CDEPEND="
112 @@ -51,7 +51,10 @@ CDEPEND="
113 !libressl? ( dev-libs/openssl:0= )
114 libressl? ( dev-libs/libressl:= )
115 sys-libs/zlib
116 - pcre? ( dev-libs/libpcre )
117 + pcre? (
118 + pcre-jit? ( dev-libs/libpcre2[jit(+)] )
119 + !pcre-jit? ( dev-libs/libpcre[-jit(-)] )
120 + )
121 perl? ( dev-lang/perl:=[-build(-)] )
122 tk? ( dev-lang/tk:0= )
123 curl? (
124 @@ -108,6 +111,7 @@ REQUIRED_USE="
125 mediawiki-experimental? ( mediawiki )
126 subversion? ( perl )
127 webdav? ( curl )
128 + pcre-jit? ( pcre )
129 python? ( ${PYTHON_REQUIRED_USE} )
130 "
131
132 @@ -173,9 +177,16 @@ exportmakeopts() {
133 || myopts+=" NO_GETTEXT=YesPlease"
134 use tk \
135 || myopts+=" NO_TCLTK=YesPlease"
136 - use pcre \
137 - && myopts+=" USE_LIBPCRE=yes" \
138 - && extlibs+=" -lpcre"
139 + if use pcre; then
140 + if use pcre-jit; then
141 + myopts+=" USE_LIBPCRE2=YesPlease"
142 + extlibs+=" -lpcre2-8"
143 + else
144 + myopts+=" USE_LIBPCRE1=YesPlease"
145 + myopts+=" NO_LIBPCRE1_JIT=YesPlease"
146 + extlibs+=" -lpcre"
147 + fi
148 + fi
149 use perl \
150 && myopts+=" INSTALLDIRS=vendor" \
151 || myopts+=" NO_PERL=YesPlease"
152
153 diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
154 index 7c6c767ea6e..d097d9be3f9 100644
155 --- a/dev-vcs/git/git-9999-r2.ebuild
156 +++ b/dev-vcs/git/git-9999-r2.ebuild
157 @@ -43,7 +43,7 @@ fi
158
159 LICENSE="GPL-2"
160 SLOT="0"
161 -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
162 +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
163
164 # Common to both DEPEND and RDEPEND
165 CDEPEND="
166 @@ -51,7 +51,10 @@ CDEPEND="
167 !libressl? ( dev-libs/openssl:0= )
168 libressl? ( dev-libs/libressl:= )
169 sys-libs/zlib
170 - pcre? ( dev-libs/libpcre )
171 + pcre? (
172 + pcre-jit? ( dev-libs/libpcre2[jit(+)] )
173 + !pcre-jit? ( dev-libs/libpcre[-jit(-)] )
174 + )
175 perl? ( dev-lang/perl:=[-build(-)] )
176 tk? ( dev-lang/tk:0= )
177 curl? (
178 @@ -108,6 +111,7 @@ REQUIRED_USE="
179 mediawiki-experimental? ( mediawiki )
180 subversion? ( perl )
181 webdav? ( curl )
182 + pcre-jit? ( pcre )
183 python? ( ${PYTHON_REQUIRED_USE} )
184 "
185
186 @@ -173,9 +177,16 @@ exportmakeopts() {
187 || myopts+=" NO_GETTEXT=YesPlease"
188 use tk \
189 || myopts+=" NO_TCLTK=YesPlease"
190 - use pcre \
191 - && myopts+=" USE_LIBPCRE=yes" \
192 - && extlibs+=" -lpcre"
193 + if use pcre; then
194 + if use pcre-jit; then
195 + myopts+=" USE_LIBPCRE2=YesPlease"
196 + extlibs+=" -lpcre2-8"
197 + else
198 + myopts+=" USE_LIBPCRE1=YesPlease"
199 + myopts+=" NO_LIBPCRE1_JIT=YesPlease"
200 + extlibs+=" -lpcre"
201 + fi
202 + fi
203 use perl \
204 && myopts+=" INSTALLDIRS=vendor" \
205 || myopts+=" NO_PERL=YesPlease"
206
207 diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
208 index f2270d9140f..5f87faa86de 100644
209 --- a/dev-vcs/git/git-9999-r3.ebuild
210 +++ b/dev-vcs/git/git-9999-r3.ebuild
211 @@ -43,7 +43,7 @@ fi
212
213 LICENSE="GPL-2"
214 SLOT="0"
215 -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
216 +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
217
218 # Common to both DEPEND and RDEPEND
219 CDEPEND="
220 @@ -51,7 +51,10 @@ CDEPEND="
221 !libressl? ( dev-libs/openssl:0= )
222 libressl? ( dev-libs/libressl:= )
223 sys-libs/zlib
224 - pcre? ( dev-libs/libpcre )
225 + pcre? (
226 + pcre-jit? ( dev-libs/libpcre2[jit(+)] )
227 + !pcre-jit? ( dev-libs/libpcre[-jit(-)] )
228 + )
229 perl? ( dev-lang/perl:=[-build(-)] )
230 tk? ( dev-lang/tk:0= )
231 curl? (
232 @@ -108,6 +111,7 @@ REQUIRED_USE="
233 mediawiki-experimental? ( mediawiki )
234 subversion? ( perl )
235 webdav? ( curl )
236 + pcre-jit? ( pcre )
237 python? ( ${PYTHON_REQUIRED_USE} )
238 "
239
240 @@ -173,9 +177,16 @@ exportmakeopts() {
241 || myopts+=" NO_GETTEXT=YesPlease"
242 use tk \
243 || myopts+=" NO_TCLTK=YesPlease"
244 - use pcre \
245 - && myopts+=" USE_LIBPCRE=yes" \
246 - && extlibs+=" -lpcre"
247 + if use pcre; then
248 + if use pcre-jit; then
249 + myopts+=" USE_LIBPCRE2=YesPlease"
250 + extlibs+=" -lpcre2-8"
251 + else
252 + myopts+=" USE_LIBPCRE1=YesPlease"
253 + myopts+=" NO_LIBPCRE1_JIT=YesPlease"
254 + extlibs+=" -lpcre"
255 + fi
256 + fi
257 use perl \
258 && myopts+=" INSTALLDIRS=vendor" \
259 || myopts+=" NO_PERL=YesPlease"
260
261 diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
262 index 1c670f22bcd..4a0448a0496 100644
263 --- a/dev-vcs/git/git-9999.ebuild
264 +++ b/dev-vcs/git/git-9999.ebuild
265 @@ -43,7 +43,7 @@ fi
266
267 LICENSE="GPL-2"
268 SLOT="0"
269 -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
270 +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
271
272 # Common to both DEPEND and RDEPEND
273 CDEPEND="
274 @@ -51,7 +51,10 @@ CDEPEND="
275 !libressl? ( dev-libs/openssl:0= )
276 libressl? ( dev-libs/libressl:= )
277 sys-libs/zlib
278 - pcre? ( dev-libs/libpcre )
279 + pcre? (
280 + pcre-jit? ( dev-libs/libpcre2[jit(+)] )
281 + !pcre-jit? ( dev-libs/libpcre[-jit(-)] )
282 + )
283 perl? ( dev-lang/perl:=[-build(-)] )
284 tk? ( dev-lang/tk:0= )
285 curl? (
286 @@ -108,6 +111,7 @@ REQUIRED_USE="
287 mediawiki-experimental? ( mediawiki )
288 subversion? ( perl )
289 webdav? ( curl )
290 + pcre-jit? ( pcre )
291 python? ( ${PYTHON_REQUIRED_USE} )
292 "
293
294 @@ -173,9 +177,16 @@ exportmakeopts() {
295 || myopts+=" NO_GETTEXT=YesPlease"
296 use tk \
297 || myopts+=" NO_TCLTK=YesPlease"
298 - use pcre \
299 - && myopts+=" USE_LIBPCRE=yes" \
300 - && extlibs+=" -lpcre"
301 + if use pcre; then
302 + if use pcre-jit; then
303 + myopts+=" USE_LIBPCRE2=YesPlease"
304 + extlibs+=" -lpcre2-8"
305 + else
306 + myopts+=" USE_LIBPCRE1=YesPlease"
307 + myopts+=" NO_LIBPCRE1_JIT=YesPlease"
308 + extlibs+=" -lpcre"
309 + fi
310 + fi
311 use perl \
312 && myopts+=" INSTALLDIRS=vendor" \
313 || myopts+=" NO_PERL=YesPlease"
314
315 diff --git a/dev-vcs/git/metadata.xml b/dev-vcs/git/metadata.xml
316 index 4a8fe9f2743..f7690883557 100644
317 --- a/dev-vcs/git/metadata.xml
318 +++ b/dev-vcs/git/metadata.xml
319 @@ -31,6 +31,7 @@
320 <flag name="highlight">GitWeb support for app-text/highlight</flag>
321 <flag name="mediawiki">Support pulling and pushing from MediaWiki</flag>
322 <flag name="mediawiki-experimental">Add experimental patches for improved MediaWiki support</flag>
323 + <flag name="pcre-jit">Enable JIT for pcre</flag>
324 <flag name="ppcsha1">Make use of a bundled routine that is optimized for the PPC arch</flag>
325 <flag name="subversion">Include git-svn for <pkg>dev-vcs/subversion</pkg> support</flag>
326 <flag name="tk">Include the 'gitk' and 'git gui' tools</flag>
Report Message
Find on MARC Find on Google Groups