Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/
Date: Mon, 26 Dec 2016 16:05:15
Message-Id: 1482768304.076cafffdbbb06c50da7ab174fbee4c6be05bcb0.polynomial-c@gentoo
1 commit: 076cafffdbbb06c50da7ab174fbee4c6be05bcb0
2 Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
3 AuthorDate: Sun Dec 25 17:47:52 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 26 16:05:04 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=076cafff
7
8 dev-vcs/git: Fix build on musl
9
10 2.10.1+ introduce a configuration option which enables non-posix compatible
11 regex by default, which breaks compilation on musl.
12
13 Gentoo-Bug: https://bugs.gentoo.org/603710
14 Closes: https://github.com/gentoo/gentoo/pull/3237
15
16 dev-vcs/git/git-2.10.1.ebuild | 2 ++
17 dev-vcs/git/git-2.10.2.ebuild | 2 ++
18 dev-vcs/git/git-2.11.0.ebuild | 2 ++
19 dev-vcs/git/git-2.11.0_rc2.ebuild | 2 ++
20 4 files changed, 8 insertions(+)
21
22 diff --git a/dev-vcs/git/git-2.10.1.ebuild b/dev-vcs/git/git-2.10.1.ebuild
23 index da2cc39..bf2f4b5 100644
24 --- a/dev-vcs/git/git-2.10.1.ebuild
25 +++ b/dev-vcs/git/git-2.10.1.ebuild
26 @@ -191,6 +191,8 @@ exportmakeopts() {
27 || myopts+=" NO_PTHREADS=YesPlease"
28 use cvs \
29 || myopts+=" NO_CVS=YesPlease"
30 + use elibc_musl \
31 + && myopts+=" NO_REGEX=YesPlease"
32 # Disabled until ~m68k-mint can be keyworded again
33 # if [[ ${CHOST} == *-mint* ]] ; then
34 # myopts+=" NO_MMAP=YesPlease"
35
36 diff --git a/dev-vcs/git/git-2.10.2.ebuild b/dev-vcs/git/git-2.10.2.ebuild
37 index f82defc..ffc7e53 100644
38 --- a/dev-vcs/git/git-2.10.2.ebuild
39 +++ b/dev-vcs/git/git-2.10.2.ebuild
40 @@ -191,6 +191,8 @@ exportmakeopts() {
41 || myopts+=" NO_PTHREADS=YesPlease"
42 use cvs \
43 || myopts+=" NO_CVS=YesPlease"
44 + use elibc_musl \
45 + && myopts+=" NO_REGEX=YesPlease"
46 # Disabled until ~m68k-mint can be keyworded again
47 # if [[ ${CHOST} == *-mint* ]] ; then
48 # myopts+=" NO_MMAP=YesPlease"
49
50 diff --git a/dev-vcs/git/git-2.11.0.ebuild b/dev-vcs/git/git-2.11.0.ebuild
51 index c4271de..82ef7b1 100644
52 --- a/dev-vcs/git/git-2.11.0.ebuild
53 +++ b/dev-vcs/git/git-2.11.0.ebuild
54 @@ -192,6 +192,8 @@ exportmakeopts() {
55 || myopts+=" NO_PTHREADS=YesPlease"
56 use cvs \
57 || myopts+=" NO_CVS=YesPlease"
58 + use elibc_musl \
59 + && myopts+=" NO_REGEX=YesPlease"
60 # Disabled until ~m68k-mint can be keyworded again
61 # if [[ ${CHOST} == *-mint* ]] ; then
62 # myopts+=" NO_MMAP=YesPlease"
63
64 diff --git a/dev-vcs/git/git-2.11.0_rc2.ebuild b/dev-vcs/git/git-2.11.0_rc2.ebuild
65 index c4271de..82ef7b1 100644
66 --- a/dev-vcs/git/git-2.11.0_rc2.ebuild
67 +++ b/dev-vcs/git/git-2.11.0_rc2.ebuild
68 @@ -192,6 +192,8 @@ exportmakeopts() {
69 || myopts+=" NO_PTHREADS=YesPlease"
70 use cvs \
71 || myopts+=" NO_CVS=YesPlease"
72 + use elibc_musl \
73 + && myopts+=" NO_REGEX=YesPlease"
74 # Disabled until ~m68k-mint can be keyworded again
75 # if [[ ${CHOST} == *-mint* ]] ; then
76 # myopts+=" NO_MMAP=YesPlease"