mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-20 13:23:08 +00:00
ac4a37c8c4
This partially reverts commit 429b3e8846.
Bring back the patches for glibc 2.12 and newer. Propagate/refresh
some patches as needed.
Signed-off-by: Alexey Neyman <stilor@att.net>
70 lines
3.2 KiB
Diff
70 lines
3.2 KiB
Diff
diff -urpN glibc-2.15.orig/configure glibc-2.15/configure
|
|
--- glibc-2.15.orig/configure 2012-03-19 07:56:58.000000000 -0700
|
|
+++ glibc-2.15/configure 2017-02-08 00:38:53.578049806 -0800
|
|
@@ -4922,7 +4922,7 @@ $as_echo_n "checking version of $CC... "
|
|
ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'`
|
|
case $ac_prog_version in
|
|
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
|
|
- 3.4* | 4.[0-9]* )
|
|
+ 3.4* | [4-9].* )
|
|
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
|
|
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
|
|
|
|
@@ -4985,7 +4985,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;;
|
|
|
|
@@ -5112,7 +5112,7 @@ $as_echo_n "checking version of $MAKEINF
|
|
ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
|
|
case $ac_prog_version in
|
|
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
|
|
- 4.*)
|
|
+ [4-9].*)
|
|
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
|
|
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
|
|
|
|
@@ -5172,7 +5172,7 @@ else
|
|
# Found it, now check the version.
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $SED" >&5
|
|
$as_echo_n "checking version of $SED... " >&6; }
|
|
- ac_prog_version=`$SED --version 2>&1 | sed -n 's/^.*GNU sed version \([0-9]*\.[0-9.]*\).*$/\1/p'`
|
|
+ ac_prog_version=`$SED --version 2>&1 | sed -n 's/^.*GNU sed[^0-9]* \([0-9]*\.[0-9.]*\).*$/\1/p'`
|
|
case $ac_prog_version in
|
|
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
|
|
3.0[2-9]*|3.[1-9]*|[4-9]*)
|
|
diff -urpN glibc-2.15.orig/configure.in glibc-2.15/configure.in
|
|
--- glibc-2.15.orig/configure.in 2012-01-01 04:16:32.000000000 -0800
|
|
+++ glibc-2.15/configure.in 2017-02-08 00:30:47.440841480 -0800
|
|
@@ -1000,11 +1000,11 @@ fi
|
|
# These programs are version sensitive.
|
|
AC_CHECK_TOOL_PREFIX
|
|
AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
|
|
- [version \([egcygnustpi-]*[0-9.]*\)], [3.4* | 4.[0-9]* ],
|
|
+ [version \([egcygnustpi-]*[0-9.]*\)], [3.4* | [4-9].* ],
|
|
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.]*\)],
|
|
@@ -1012,10 +1012,10 @@ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsg
|
|
MSGFMT=: aux_missing="$aux_missing msgfmt")
|
|
AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
|
|
[GNU texinfo.* \([0-9][0-9.]*\)],
|
|
- [4.*],
|
|
+ [[4-9].*],
|
|
MAKEINFO=: aux_missing="$aux_missing makeinfo")
|
|
AC_CHECK_PROG_VER(SED, sed, --version,
|
|
- [GNU sed version \([0-9]*\.[0-9.]*\)],
|
|
+ [GNU sed[^0-9]* \([0-9]*\.[0-9.]*\)],
|
|
[3.0[2-9]*|3.[1-9]*|[4-9]*],
|
|
SED=: aux_missing="$aux_missing sed")
|
|
|