- updated to 3.20.0 (now knows rseq syscall)

[packages/valgrind.git] / valgrind.spec

diff --git a/valgrind.spec b/valgrind.spec
index 97ef2a01670dcbccb9abcaed6c94821e1eac6567..bbd98ea2a7879dca9123c292334104b1de2b9112 100644 (file)
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -7,32 +7,34 @@
 Summary:       An open-source memory debugger
 Summary(pl.UTF-8):     Otwarty odpluskwiacz pamięci
 Name:          valgrind
-Version:       3.10.1
-Release:       2
+Version:       3.20.0
+Release:       1
 License:       GPL v2+
 Group:         Development/Tools
-Source0:       http://valgrind.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 60ddae962bc79e7c95cfc4667245707f
+Source0:       https://sourceware.org/pub/valgrind/%{name}-%{version}.tar.bz2
+# Source0-md5: e3ca8e03c6c527e80e7da5135a1b6beb
 Patch0:                %{name}-native-cpuid.patch
 Patch1:                %{name}-ld_linux_strlen.patch
-Patch2:                %{name}-glibc.patch
-Patch3:                kernel-4.x.patch
-URL:           http://valgrind.org/
+Patch2:                %{name}-datadir.patch
+URL:           https://www.valgrind.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1:1.10
 BuildRequires: gcc >= 5:3.0
+%ifarch x32
+BuildRequires: gcc-multilib-64 >= 5:3.0
+%endif
 # check in configure.ac:882 AC_MSG_CHECKING([the GLIBC_VERSION version])
 BuildRequires: glibc-devel >= 6:2.2
-BuildRequires: glibc-devel < 6:2.22
 BuildRequires: libgomp-devel
 BuildRequires: libstdc++-devel
 %{?with_mpi:BuildRequires:     mpi-devel}
-Obsoletes:     valgrind-callgrind
-Obsoletes:     valgrind-calltree
-ExclusiveArch: %{ix86} %{x8664} arm ppc ppc64 s390x x32
+Obsoletes:     valgrind-callgrind < 0.11
+Obsoletes:     valgrind-calltree < 0.10
+ExclusiveArch: %{ix86} %{x8664} armv7hl armv7hnl armv7l ppc ppc64 s390x x32 aarch64
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _noautostrip    .*/vgpreload.*\\.so
+%define                filterout_c     -fstack-protector-strong
 # ld portion broken
 %undefine      with_ccache
 
@@ -57,9 +59,6 @@ pracować.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-
-sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.ac
 
 %build
 %{__aclocal}
@@ -69,11 +68,12 @@ sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configur
 
 ac_cv_path_GDB=/usr/bin/gdb \
 %configure \
-       CC=gcc \
        --enable-tls \
-%if %{_lib} != "lib"
+       %{!?with_mpi:--with-mpicc=/bin/false} \
+%if "%{_lib}" != "lib"
        --enable-only64bit \
-%endif
+%endif \
+       --enable-lto \
        LDFLAGS="" # no strip!
 
 %{__make}
@@ -106,15 +106,19 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/valgrind-listener
 %attr(755,root,root) %{_bindir}/vgdb
 %dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/*-linux
-%attr(755,root,root) %{_libdir}/%{name}/vgpreload_*-linux.so
+%{_libdir}/%{name}/lib*-linux.a
 %if %{with mpi}
 # TODO: subpackage?
 %attr(755,root,root) %{_libdir}/%{name}/libmpiwrap-*-linux.so
 %endif
-%{_libdir}/%{name}/*.xml
-%{_libdir}/%{name}/default.supp
-%{_libdir}/%{name}/lib*-linux.a
+%if "%{_libexecdir}" != "%{_libdir}"
+%dir %{_libexecdir}/%{name}
+%endif
+%attr(755,root,root) %{_libexecdir}/%{name}/*-linux
+%attr(755,root,root) %{_libexecdir}/%{name}/vgpreload_*-linux.so
+%{_libexecdir}/%{name}/*.xml
+%{_libexecdir}/%{name}/default.supp
+%{_datadir}/%{name}
 %{_includedir}/valgrind
 %{_mandir}/man1/callgrind_annotate.1*
 %{_mandir}/man1/callgrind_control.1*
@@ -123,6 +127,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/cg_merge.1*
 %{_mandir}/man1/ms_print.1*
 %{_mandir}/man1/valgrind.1*
+%{_mandir}/man1/valgrind-di-server.1*
 %{_mandir}/man1/valgrind-listener.1*
 %{_mandir}/man1/vgdb.1*
 %{_pkgconfigdir}/valgrind.pc