- fix build with linux 4.x

- enable x32
- rel 2

diff --git a/kernel-4.x.patch b/kernel-4.x.patch
new file mode 100644 (file)
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 4ddf5f5cf6295de6b8ec117dd9baa790cc2b1cd5..97ef2a01670dcbccb9abcaed6c94821e1eac6567 100644 (file)
--- 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