r6035 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2014-05-04 20:24:59 +0000 (Sun, 04 May 2014)
New Revision: 6035
Added:
glibc-package/trunk/debian/patches/any/cvs-make-4.0.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
patches/any/cvs-make-4.0.diff: patch from upstream to allow GNU Make
4.0 and greater. Closes: #747013.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2014-05-02 10:51:33 UTC (rev 6034)
+++ glibc-package/trunk/debian/changelog 2014-05-04 20:24:59 UTC (rev 6035)
@@ -6,6 +6,10 @@
* patches/hurd-i386/cvs-libpthread_guardsize.diff: Fix guardsize semantic
for gcc's -fsplit-stack.
+ [ Aurelien Jarno ]
+ * patches/any/cvs-make-4.0.diff: patch from upstream to allow GNU Make
+ 4.0 and greater. Closes: #747013.
+
-- Adam Conrad <adconrad@0c3.net> Sun, 27 Apr 2014 23:15:13 -0600
eglibc (2.18-5) unstable; urgency=medium
Added: glibc-package/trunk/debian/patches/any/cvs-make-4.0.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-make-4.0.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-make-4.0.diff 2014-05-04 20:24:59 UTC (rev 6035)
@@ -0,0 +1,30 @@
+2013-10-31 Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+
+ [BZ #16037]
+ * configure.ac: allow GNU Make 4.0 and greater.
+ * configure: Regenerated.
+
+diff --git a/configure b/configure
+--- a/configure
++++ b/configure
+@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; }
+ 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;;
+
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
+ 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.]*\)],
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2014-05-02 10:51:33 UTC (rev 6034)
+++ glibc-package/trunk/debian/patches/series 2014-05-04 20:24:59 UTC (rev 6035)
@@ -273,3 +273,4 @@
any/cvs-ptrace_peeksiginfo_args.diff
any/local-ldconfig-ignore-ld.so.diff
any/local-no-malloc-backtrace.diff
+any/cvs-make-4.0.diff
Reply to: