glibc: Backport upstream patch to accept make-4.0 or newer
Upstream patch (28d708c44bc47b56f6551ff285f78edcf61c208a) added support for make-4.0 or newer. We backport this patch to allow glibc to build on hosts running the latest version of 'make'. Signed-off-by: Markos Chandras <markos.chandras@imgtec.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
b341b6c1a7
commit
9dd5803a8c
33
package/glibc/2.18-svnr23787/glibc-0001-accept-make4.patch
Normal file
33
package/glibc/2.18-svnr23787/glibc-0001-accept-make4.patch
Normal file
|
@ -0,0 +1,33 @@
|
|||
Backport upstream patch (28d708c44bc47b56f6551ff285f78edcf61c208a) to accept
|
||||
make-4.0 or newer.
|
||||
We patch both configure and configure.in files so if we ever have to run
|
||||
autoreconf in the glibc source, then the fix will be propagated properly.
|
||||
|
||||
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
|
||||
|
||||
Index: glibc-2.18-svnr23787/libc/configure
|
||||
===================================================================
|
||||
--- glibc-2.18-svnr23787.orig/libc/configure
|
||||
+++ glibc-2.18-svnr23787/libc/configure
|
||||
@@ -4772,7 +4772,7 @@ $as_echo_n "checking version of $MAKE...
|
||||
ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
|
||||
case $ac_prog_version in
|
||||
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
|
||||
- 3.79* | 3.[89]*)
|
||||
+ 3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*)
|
||||
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
|
||||
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
|
||||
|
||||
Index: glibc-2.18-svnr23787/libc/configure.in
|
||||
===================================================================
|
||||
--- glibc-2.18-svnr23787.orig/libc/configure.in
|
||||
+++ glibc-2.18-svnr23787/libc/configure.in
|
||||
@@ -989,7 +989,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}g
|
||||
critic_missing="$critic_missing gcc")
|
||||
AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
|
||||
[GNU Make[^0-9]*\([0-9][0-9.]*\)],
|
||||
- [3.79* | 3.[89]*], critic_missing="$critic_missing make")
|
||||
+ [3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*], critic_missing="$critic_missing make")
|
||||
|
||||
AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
|
||||
[GNU gettext.* \([0-9]*\.[0-9.]*\)],
|
33
package/glibc/2.18/glibc-0001-accept-make4.patch
Normal file
33
package/glibc/2.18/glibc-0001-accept-make4.patch
Normal file
|
@ -0,0 +1,33 @@
|
|||
Backport upstream patch (28d708c44bc47b56f6551ff285f78edcf61c208a) to accept
|
||||
make-4.0 or newer.
|
||||
We patch both configure and configure.in files so if we ever have to run
|
||||
autoreconf in the glibc source, then the fix will be propagated properly.
|
||||
|
||||
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
|
||||
|
||||
Index: glibc-2.18/configure
|
||||
===================================================================
|
||||
--- glibc-2.18.orig/configure
|
||||
+++ glibc-2.18/configure
|
||||
@@ -4772,7 +4772,7 @@ $as_echo_n "checking version of $MAKE...
|
||||
ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
|
||||
case $ac_prog_version in
|
||||
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
|
||||
- 3.79* | 3.[89]*)
|
||||
+ 3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*)
|
||||
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
|
||||
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
|
||||
|
||||
Index: glibc-2.18/configure.in
|
||||
===================================================================
|
||||
--- glibc-2.18.orig/configure.in
|
||||
+++ glibc-2.18/configure.in
|
||||
@@ -989,7 +989,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}g
|
||||
critic_missing="$critic_missing gcc")
|
||||
AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
|
||||
[GNU Make[^0-9]*\([0-9][0-9.]*\)],
|
||||
- [3.79* | 3.[89]*], critic_missing="$critic_missing make")
|
||||
+ [3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*], critic_missing="$critic_missing make")
|
||||
|
||||
AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
|
||||
[GNU gettext.* \([0-9]*\.[0-9.]*\)],
|
Loading…
Reference in a new issue