From cfde8ab69337979052422dd9c922ff9c0b37bd74 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 10 May 2015 12:59:35 +0200 Subject: [PATCH] - fix build with linux 4.x - enable x32 - rel 2 --- kernel-4.x.patch | 11 +++++++++++ valgrind.spec | 6 ++++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 kernel-4.x.patch diff --git a/kernel-4.x.patch b/kernel-4.x.patch new file mode 100644 index 0000000..0420187 --- /dev/null +++ b/kernel-4.x.patch @@ -0,0 +1,11 @@ +--- valgrind-3.10.1/configure.ac~ 2015-05-10 12:56:39.000000000 +0200 ++++ valgrind-3.10.1/configure.ac 2015-05-10 12:57:15.434577885 +0200 +@@ -303,7 +303,7 @@ + kernel=`uname -r` + + case "${kernel}" in +- 2.6.*|3.*) ++ 2.6.*|3.*|4.*) + 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]) + ;; diff --git a/valgrind.spec b/valgrind.spec index 4ddf5f5..97ef2a0 100644 --- a/valgrind.spec +++ b/valgrind.spec @@ -8,7 +8,7 @@ Summary: An open-source memory debugger Summary(pl.UTF-8): Otwarty odpluskwiacz pamięci Name: valgrind Version: 3.10.1 -Release: 1 +Release: 2 License: GPL v2+ Group: Development/Tools Source0: http://valgrind.org/downloads/%{name}-%{version}.tar.bz2 @@ -16,6 +16,7 @@ Source0: http://valgrind.org/downloads/%{name}-%{version}.tar.bz2 Patch0: %{name}-native-cpuid.patch Patch1: %{name}-ld_linux_strlen.patch Patch2: %{name}-glibc.patch +Patch3: kernel-4.x.patch URL: http://valgrind.org/ BuildRequires: autoconf >= 2.50 BuildRequires: automake >= 1:1.10 @@ -28,7 +29,7 @@ BuildRequires: libstdc++-devel %{?with_mpi:BuildRequires: mpi-devel} Obsoletes: valgrind-callgrind Obsoletes: valgrind-calltree -ExclusiveArch: %{ix86} %{x8664} arm ppc ppc64 s390x +ExclusiveArch: %{ix86} %{x8664} arm ppc ppc64 s390x x32 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _noautostrip .*/vgpreload.*\\.so @@ -56,6 +57,7 @@ pracować. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.ac -- 2.44.0