commit:     076cafffdbbb06c50da7ab174fbee4c6be05bcb0
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sun Dec 25 17:47:52 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Dec 26 16:05:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=076cafff

dev-vcs/git: Fix build on musl

2.10.1+ introduce a configuration option which enables non-posix compatible
regex by default, which breaks compilation on musl.

Gentoo-Bug: https://bugs.gentoo.org/603710
Closes: https://github.com/gentoo/gentoo/pull/3237

 dev-vcs/git/git-2.10.1.ebuild     | 2 ++
 dev-vcs/git/git-2.10.2.ebuild     | 2 ++
 dev-vcs/git/git-2.11.0.ebuild     | 2 ++
 dev-vcs/git/git-2.11.0_rc2.ebuild | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/dev-vcs/git/git-2.10.1.ebuild b/dev-vcs/git/git-2.10.1.ebuild
index da2cc39..bf2f4b5 100644
--- a/dev-vcs/git/git-2.10.1.ebuild
+++ b/dev-vcs/git/git-2.10.1.ebuild
@@ -191,6 +191,8 @@ exportmakeopts() {
                || myopts+=" NO_PTHREADS=YesPlease"
        use cvs \
                || myopts+=" NO_CVS=YesPlease"
+       use elibc_musl \
+               && myopts+=" NO_REGEX=YesPlease"
 # Disabled until ~m68k-mint can be keyworded again
 #      if [[ ${CHOST} == *-mint* ]] ; then
 #              myopts+=" NO_MMAP=YesPlease"

diff --git a/dev-vcs/git/git-2.10.2.ebuild b/dev-vcs/git/git-2.10.2.ebuild
index f82defc..ffc7e53 100644
--- a/dev-vcs/git/git-2.10.2.ebuild
+++ b/dev-vcs/git/git-2.10.2.ebuild
@@ -191,6 +191,8 @@ exportmakeopts() {
                || myopts+=" NO_PTHREADS=YesPlease"
        use cvs \
                || myopts+=" NO_CVS=YesPlease"
+       use elibc_musl \
+               && myopts+=" NO_REGEX=YesPlease"
 # Disabled until ~m68k-mint can be keyworded again
 #      if [[ ${CHOST} == *-mint* ]] ; then
 #              myopts+=" NO_MMAP=YesPlease"

diff --git a/dev-vcs/git/git-2.11.0.ebuild b/dev-vcs/git/git-2.11.0.ebuild
index c4271de..82ef7b1 100644
--- a/dev-vcs/git/git-2.11.0.ebuild
+++ b/dev-vcs/git/git-2.11.0.ebuild
@@ -192,6 +192,8 @@ exportmakeopts() {
                || myopts+=" NO_PTHREADS=YesPlease"
        use cvs \
                || myopts+=" NO_CVS=YesPlease"
+       use elibc_musl \
+               && myopts+=" NO_REGEX=YesPlease"
 # Disabled until ~m68k-mint can be keyworded again
 #      if [[ ${CHOST} == *-mint* ]] ; then
 #              myopts+=" NO_MMAP=YesPlease"

diff --git a/dev-vcs/git/git-2.11.0_rc2.ebuild 
b/dev-vcs/git/git-2.11.0_rc2.ebuild
index c4271de..82ef7b1 100644
--- a/dev-vcs/git/git-2.11.0_rc2.ebuild
+++ b/dev-vcs/git/git-2.11.0_rc2.ebuild
@@ -192,6 +192,8 @@ exportmakeopts() {
                || myopts+=" NO_PTHREADS=YesPlease"
        use cvs \
                || myopts+=" NO_CVS=YesPlease"
+       use elibc_musl \
+               && myopts+=" NO_REGEX=YesPlease"
 # Disabled until ~m68k-mint can be keyworded again
 #      if [[ ${CHOST} == *-mint* ]] ; then
 #              myopts+=" NO_MMAP=YesPlease"

Reply via email to