]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
valgrind: Backport patch to fix build on 4.0 host kernels
authorChristian Artin <christian@gridshowsystems.com>
Wed, 6 May 2015 17:26:58 +0000 (13:26 -0400)
committerPeter Korsgaard <peter@korsgaard.com>
Thu, 7 May 2015 20:34:58 +0000 (22:34 +0200)
Valgrind fails to build when the host kernel is >=4.0. This patch
backports the commit from upstream that fixes the kernel version
verification. This verification is pointless for buildroot anyway, but
it fixes the building process.

[Peter: rename patch to 0002-* and add SoB, slightly reword commit msg]
Signed-off-by: Christian Artin <christian@gridshowsystems.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/valgrind/0002-Fix-configure-for-Linux-kernel-4.0-rc1.patch [new file with mode: 0644]

diff --git a/package/valgrind/0002-Fix-configure-for-Linux-kernel-4.0-rc1.patch b/package/valgrind/0002-Fix-configure-for-Linux-kernel-4.0-rc1.patch
new file mode 100644 (file)
index 0000000..1d0ba26
--- /dev/null
@@ -0,0 +1,48 @@
+From 8e958577f01e2e877fb1dbdca09718ef6ea0c748 Mon Sep 17 00:00:00 2001
+From: cborntra <cborntra@a5019735-40e9-0310-863c-91ae7b9d1cf9>
+Date: Mon, 23 Feb 2015 20:19:03 +0000
+Subject: [PATCH] Fix configure for Linux kernel >= 4.0-rc1 In addition raise
+ the minimal Linux version to 2.6 as there is almost no test coverage for 2.4
+ and 2.6 was released in 2003.
+
+Signed-off-by: Christian Artin <christian@gridshowsystems.com>
+
+git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14955 a5019735-40e9-0310-863c-91ae7b9d1cf9
+---
+ configure.ac | 18 ++++++------------
+ 1 file changed, 6 insertions(+), 12 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index bdf5f22..136f49a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -325,20 +325,14 @@ case "${host_os}" in
+         kernel=`uname -r`
+         case "${kernel}" in
+-             2.6.*|3.*) 
+-                  AC_MSG_RESULT([2.6.x/3.x family (${kernel})])
+-                  AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x])
+-                  ;;
+-
+-             2.4.*) 
+-                  AC_MSG_RESULT([2.4 family (${kernel})])
+-                  AC_DEFINE([KERNEL_2_4], 1, [Define to 1 if you're using Linux 2.4.x])
+-                  ;;
+-
+-             *) 
++             0.*|1.*|2.0.*|2.1.*|2.2.*|2.3.*|2.4.*|2.5.*) 
+                   AC_MSG_RESULT([unsupported (${kernel})])
+-                  AC_MSG_ERROR([Valgrind works on kernels 2.4, 2.6])
++                  AC_MSG_ERROR([Valgrind needs a Linux kernel >= 2.6])
+                   ;;
++
++             *)
++                  AC_MSG_RESULT([2.6 or later (${kernel})])
++                    ;;
+         esac
+         ;;
+-- 
+2.3.7
+