[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     d1fb64f7b107149d893966feac6d52fe1e95795f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 18:55:14 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 18:55:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d1fb64f7

scripts/bootstrap-prefix: add patch for make with newer glibc

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 3b4e648d0a..b737a16622 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -806,6 +806,23 @@ bootstrap_gnu() {
        fi
 
        local myconf=""
+       if [[ ${PN} == "make" && ${PV} == "4.2.1" ]] ; then
+               # mimick 
http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116a914a325a0497721f5d8b58d5bba34d4
+               local oldl="# if _GNU_GLOB_INTERFACE_VERSION == 
GLOB_INTERFACE_VERSION"
+               local newl="# if _GNU_GLOB_INTERFACE_VERSION == 1 || 
_GNU_GLOB_INTERFACE_VERSION == 2"
+               mv configure.ac{,.orig}
+               mv configure{,.orig}
+               sed -e '/^#define GLOB_INTERFACE_VERSION 1/d' \
+                       -e "s/^${oldl}/${newl}/" \
+                       configure.ac.orig > configure.ac
+               sed -e '/^#define GLOB_INTERFACE_VERSION 1/d' \
+                       -e "s/^${oldl}/${newl}/" \
+                       configure.orig > configure
+               chmod 755 configure
+               touch -r configure.ac{.orig,}
+               touch -r configure{.orig,}
+       fi
+
        if [[ ${PN} == "grep" ]] ; then
                # Solaris and OSX don't like it when --disable-nls is set,
                # so just don't set it at all.