From c12e95dd5cc3117c8e63069831a055276c3b1e5ba770595bbf720869645300e3 Mon Sep 17 00:00:00 2001 From: Tomas Cech Date: Fri, 24 Apr 2015 09:00:38 +0000 Subject: [PATCH] Accepting request 299063 from home:dimstar:Factory This should fix build of valgrind with Linux kernel 4.0, currently in staging J OBS-URL: https://build.opensuse.org/request/show/299063 OBS-URL: https://build.opensuse.org/package/show/devel:tools/valgrind?expand=0&rev=130 --- valgrind-linux-4.0.patch | 31 +++++++++++++++++++++++++++++++ valgrind.changes | 6 ++++++ valgrind.spec | 2 ++ 3 files changed, 39 insertions(+) create mode 100644 valgrind-linux-4.0.patch diff --git a/valgrind-linux-4.0.patch b/valgrind-linux-4.0.patch new file mode 100644 index 0000000..07586dd --- /dev/null +++ b/valgrind-linux-4.0.patch @@ -0,0 +1,31 @@ +Index: configure.ac +=================================================================== +--- configure.ac (revision 14954) ++++ configure.ac (revision 14955) +@@ -325,20 +325,14 @@ + 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]) ++ 0.*|1.*|2.0.*|2.1.*|2.2.*|2.3.*|2.4.*|2.5.*) ++ AC_MSG_RESULT([unsupported (${kernel})]) ++ AC_MSG_ERROR([Valgrind needs a Linux kernel >= 2.6]) + ;; + +- 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]) +- ;; +- +- *) +- AC_MSG_RESULT([unsupported (${kernel})]) +- AC_MSG_ERROR([Valgrind works on kernels 2.4, 2.6]) +- ;; ++ *) ++ AC_MSG_RESULT([2.6 or later (${kernel})]) ++ ;; + esac + + ;; diff --git a/valgrind.changes b/valgrind.changes index 4c57d62..374d332 100644 --- a/valgrind.changes +++ b/valgrind.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 24 07:08:01 UTC 2015 - dimstar@opensuse.org + +- Add valgrind-linux-4.0.patch: Fix build with linux kernel 4.0+. + Taken from svn, rev 14955. + ------------------------------------------------------------------- Thu Apr 2 18:07:55 UTC 2015 - mpluskal@suse.com diff --git a/valgrind.spec b/valgrind.spec index d3603a9..d5fb1c3 100644 --- a/valgrind.spec +++ b/valgrind.spec @@ -38,6 +38,7 @@ Patch1: jit-register-unregister.diff Patch2: armv6-support.diff Patch3: glibc-version.patch Patch4: gcc-version.patch +Patch5: valgrind-linux-4.0.patch BuildRequires: automake BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook_4 @@ -113,6 +114,7 @@ but it has been successfully used to optimize several KDE applications. %patch2 %patch3 -p1 %patch4 +%patch5 %build %ifarch %arm