X-Git-Url: http://git.pld-linux.org/?p=packages%2Fvalgrind.git;a=blobdiff_plain;f=valgrind.spec;h=e94237df53c94cdb277674026e2b6e152c01c726;hp=6bb7a8e0b99ad8c60e44e9be6ecb998fa6bcfc7b;hb=644f5b95edb253b6858682e2787c80dc89f020e5;hpb=be3989edc0d04dd3b53491d8cb9b0e0bd92467d3

diff --git a/valgrind.spec b/valgrind.spec
index 6bb7a8e..e94237d 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -1,60 +1,81 @@
+# TODO:
+# - fix CC detection in configure, so CC=gcc won't be needed
+#
+# Conditional build:
+%bcond_with	mpi	# MPI wrapper module
+#
 Summary:	An open-source memory debugger
 Summary(pl.UTF-8):	Otwarty odpluskwiacz pamięci
 Name:		valgrind
-Version:	3.5.0
-Release:	2
-License:	GPL
+Version:	3.14.0
+Release:	1
+License:	GPL v2+
 Group:		Development/Tools
-Source0:	http://valgrind.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5:	f03522a4687cf76c676c9494fcc0a517
-Patch0:		%{name}-debuginfo.patch
+Source0:	https://sourceware.org/pub/valgrind/%{name}-%{version}.tar.bz2
+# Source0-md5:	74175426afa280184b62591b58c671b3
+Patch0:		%{name}-native-cpuid.patch
+Patch1:		%{name}-ld_linux_strlen.patch
 URL:		http://valgrind.org/
-BuildRequires:	autoconf
-BuildRequires:	automake
-# Needs libc.a
-BuildRequires:	glibc-static
+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:	libgomp-devel
+BuildRequires:	libstdc++-devel
+%{?with_mpi:BuildRequires:	mpi-devel}
 Obsoletes:	valgrind-callgrind
 Obsoletes:	valgrind-calltree
-ExclusiveArch:	%{ix86} %{x8664} ppc ppc64
+ExclusiveArch:	%{ix86} %{x8664} arm ppc ppc64 s390x x32
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_noautostrip	.*/vgpreload.*\\.so
+%define		filterout_c	-fstack-protector-strong
 # ld portion broken
 %undefine	with_ccache
 
 %description
 Valgrind is a GPL'd system for debugging and profiling Linux programs.
 With the tools that come with Valgrind, you can automatically detect
-many memory management and threading bugs, avoiding hours of frustrating
-bug-hunting, making your programs more stable. You can also perform
-detailed profiling to help speed up your programs.
+many memory management and threading bugs, avoiding hours of
+frustrating bug-hunting, making your programs more stable. You can
+also perform detailed profiling to help speed up your programs.
 
 %description -l pl.UTF-8
 Valgrind jest systemem służącym do odpluskwiania i profilowania
 programów na Linuksie. Używając dostarczanych z nim narzędzi można
-automatycznie wykrywać wiele błędów związanych z zarządzaniem pamięcią i
-wątkowaniem, dzięki czemu unika się frustrującego polowania na błędy, a
-także czyni się programy bardziej stabilnymi. Możliwe jest również
-dokładne profilowanie, dzięki któremu programy zaczną szybciej pracować.
+automatycznie wykrywać wiele błędów związanych z zarządzaniem pamięcią
+i wątkowaniem, dzięki czemu unika się frustrującego polowania na
+błędy, a także czyni się programy bardziej stabilnymi. Możliwe jest
+również dokładne profilowanie, dzięki któremu programy zaczną szybciej
+pracować.
 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
-sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in
+sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.ac
 
 %build
 %{__aclocal}
-%{__autoheader}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
+
+ac_cv_path_GDB=/usr/bin/gdb \
 %configure \
+	CC=gcc \
 	--enable-tls \
 %if %{_lib} != "lib"
 	--enable-only64bit \
-%endif
+%endif \
+	--enable-lto=yes \
 	LDFLAGS="" # no strip!
+
 %{__make}
 
 %install
@@ -63,23 +84,45 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf _docs
-mv $RPM_BUILD_ROOT%{_docdir}/valgrind _docs
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/doc
+cp -p docs/index.pdf docs/valgrind_manual.pdf
+cp -p docs/index.ps docs/valgrind_manual.ps
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS FAQ.txt NEWS README README_MISSING_SYSCALL_OR_IOCTL
-%doc _docs/html
-%doc _docs/valgrind_manual.pdf
-%attr(755,root,root) %{_bindir}/*
+%doc AUTHORS NEWS README README_MISSING_SYSCALL_OR_IOCTL
+%doc docs/html docs/valgrind_manual.pdf docs/valgrind_manual.ps
+%attr(755,root,root) %{_bindir}/callgrind_annotate
+%attr(755,root,root) %{_bindir}/callgrind_control
+%attr(755,root,root) %{_bindir}/cg_annotate
+%attr(755,root,root) %{_bindir}/cg_diff
+%attr(755,root,root) %{_bindir}/cg_merge
+%attr(755,root,root) %{_bindir}/ms_print
+%attr(755,root,root) %{_bindir}/valgrind
+%attr(755,root,root) %{_bindir}/valgrind-di-server
+%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}/*.so
-%{_libdir}/%{name}/*.supp
-%{_libdir}/%{name}/*.a
-%{_includedir}/*
-%{_pkgconfigdir}/*.pc
-%{_mandir}/man1/*.1*
+%attr(755,root,root) %{_libdir}/%{name}/vgpreload_*-linux.so
+%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
+%{_includedir}/valgrind
+%{_mandir}/man1/callgrind_annotate.1*
+%{_mandir}/man1/callgrind_control.1*
+%{_mandir}/man1/cg_annotate.1*
+%{_mandir}/man1/cg_diff.1*
+%{_mandir}/man1/cg_merge.1*
+%{_mandir}/man1/ms_print.1*
+%{_mandir}/man1/valgrind.1*
+%{_mandir}/man1/valgrind-listener.1*
+%{_mandir}/man1/vgdb.1*
+%{_pkgconfigdir}/valgrind.pc