summaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorChris Packham <chris.packham@alliedtelesis.co.nz>2016-02-15 21:28:32 (GMT)
committerChris Packham <chris.packham@alliedtelesis.co.nz>2016-02-15 22:29:36 (GMT)
commit8356119b1edeff543b071bf7c05b132532cc0f06 (patch)
treefcbc43c96be46510385a768cdf2db70d4093a5e2 /patches
parente812493c6fb4e9ae7724b42a5bdbb97c05bd7575 (diff)
libc/glibc: Fix sed configure check
Backport of upstream commit. Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Diffstat (limited to 'patches')
-rw-r--r--patches/glibc/2.16.0/520-fix-sed-configure-check.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/patches/glibc/2.16.0/520-fix-sed-configure-check.patch b/patches/glibc/2.16.0/520-fix-sed-configure-check.patch
new file mode 100644
index 0000000..9cf06d6
--- /dev/null
+++ b/patches/glibc/2.16.0/520-fix-sed-configure-check.patch
@@ -0,0 +1,35 @@
+From 07e515506660b1d0c1934dc0ac0e2ac5e7a4a760 Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <ldv@altlinux.org>
+Date: Wed, 22 Aug 2012 12:58:18 -0700
+Subject: [PATCH] Fix sed configure check for newer sed --version output.
+
+---
+diff --git a/configure b/configure
+index 9dddf3c..a573bfe 100755
+--- a/configure
++++ b/configure
+@@ -4963,7 +4963,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 --git a/configure.in b/configure.in
+index f5dbff6..1b05c87 100644
+--- a/configure.in
++++ b/configure.in
+@@ -909,7 +909,7 @@ AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
+ [4.[5-9]*|4.[1-9][0-9]*|[5-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")
+
+--
+1.9.4
+