summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLin Tong <tong.lin@intel.com>2011-08-11 14:01:52 +0800
committerJoshua Lock <josh@linux.intel.com>2011-10-14 11:39:12 -0700
commit2816cc0db87004a4a6dd7580887cd843101c241f (patch)
treee2d45b49c22a98a8380fa94df937c8796049b180
parentc998000630bb70986d6693b6efbce0087f200860 (diff)
downloadpoky-2816cc0db87004a4a6dd7580887cd843101c241f.tar.gz
valgrind: supporting on Linux kernel 3.x
The old valgrind package do not support for Linux kernel 3.x, only for kernel 2.4 and 2.6. Now adding the configuration to the configure.in file to support Linux kernel 3.0. This commit fixes the problem in valgrind [YOCTO #1129] (From OE-Core rev: 5fc1e6d27f52e2032aa7a8ca20bb90d939d03c77) Signed-off-by: Lin Tong <tong.lin@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Applied to Bernard's valgrind 3.6.0 Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rw-r--r--meta/recipes-devtools/valgrind/valgrind-3.6.0/fix_unsupporting_kernel_3.patch26
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.6.0.bb5
2 files changed, 29 insertions, 2 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind-3.6.0/fix_unsupporting_kernel_3.patch b/meta/recipes-devtools/valgrind/valgrind-3.6.0/fix_unsupporting_kernel_3.patch
new file mode 100644
index 0000000000..346ffebb3d
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind-3.6.0/fix_unsupporting_kernel_3.patch
@@ -0,0 +1,26 @@
1valgrind: Add 3.x statements to "case" for supporting the kernel 3.x
2
3Signed-off-by: Lin Tong <tong.lin@intel.com>
4
5Upstream-Status: Pending
6
7diff --git a/configure.in b/configure.in
8index 3878619..1cb7dc7 100644
9--- a/configure.in
10+++ b/configure.in
11@@ -229,10 +229,14 @@ case "${host_os}" in
12 AC_MSG_RESULT([2.4 family (${kernel})])
13 AC_DEFINE([KERNEL_2_4], 1, [Define to 1 if you're using Linux 2.4.x])
14 ;;
15+ 3.*)
16+ AC_MSG_RESULT([3 family (${kernel})])
17+ AC_DEFINE([KERNEL_3], 1, [Define to 1 if you're using Linux 3.x])
18+ ;;
19
20 *)
21 AC_MSG_RESULT([unsupported (${kernel})])
22- AC_MSG_ERROR([Valgrind works on kernels 2.4, 2.6])
23+ AC_MSG_ERROR([Valgrind works on kernels 2.4, 2.6, 3.x])
24 ;;
25 esac
26
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.6.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.6.0.bb
index a33a540198..066c16d0bc 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.6.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.6.0.bb
@@ -7,11 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c46082167a314d785d012a244748d803 \
7 file://include/valgrind.h;beginline=1;endline=56;md5=13a71cedba99112334d8596162aec37e \ 7 file://include/valgrind.h;beginline=1;endline=56;md5=13a71cedba99112334d8596162aec37e \
8 file://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215" 8 file://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215"
9DEPENDS = "virtual/libx11" 9DEPENDS = "virtual/libx11"
10PR = "r0" 10PR = "r1"
11 11
12SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ 12SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
13 file://fix_issue_caused_by_ccache.patch \ 13 file://fix_issue_caused_by_ccache.patch \
14 file://fixed-perl-path.patch" 14 file://fixed-perl-path.patch \
15 file://fix_unsupporting_kernel_3.patch"
15 16
16SRC_URI[md5sum] = "b289c5f4ab8e39741602445f1dd09b34" 17SRC_URI[md5sum] = "b289c5f4ab8e39741602445f1dd09b34"
17SRC_URI[sha256sum] = "bc0f0153b5a47b986f1d8efa2c488e0aea85a1cf2c4b11c52be127903080285f" 18SRC_URI[sha256sum] = "bc0f0153b5a47b986f1d8efa2c488e0aea85a1cf2c4b11c52be127903080285f"