- Valgrind insisted on redirecting the 'strlen' symbol in /lib/ld-linux.so.2,

[packages/valgrind.git] / valgrind.spec

diff --git a/valgrind.spec b/valgrind.spec
index 0ad5eb99d3f1ac3374349d1dd5727915d9e2376b..75e9bb3a311e9de055ca03d0f2f6b852cde468af 100644 (file)
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -1,25 +1,31 @@
-#
-%define                _rel    test2
-#
+# TODO:
+# - fix CC detection in configure, so CC=gcc won't be needed
 Summary:       An open-source memory debugger
 Summary(pl.UTF-8):     Otwarty odpluskwiacz pamięci
 Name:          valgrind
-Version:       3.6.0
-Release:       0.%{_rel}.1
+Version:       3.7.0
+Release:       2
 License:       GPL
 Group:         Development/Tools
-Source0:       http://valgrind.org/downloads/%{name}-%{version}-%{_rel}.tar.bz2
-# Source0-md5: 49b94fcba8d653da21601f0ad87c014e
+Source0:       http://valgrind.org/downloads/%{name}-%{version}.tar.bz2
+# Source0-md5: a855fda56edf05614f099dca316d1775
 Patch0:                %{name}-debuginfo.patch
+Patch1:                %{name}-native-cpuid.patch
+Patch2:                %{name}-automake-1.11.2.patch
+Patch3:                %{name}-ld_linux_strlen.patch
 URL:           http://valgrind.org/
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: gcc >= 5:3.0
 # Needs libc.a
+BuildRequires: glibc-devel >= 6:2.2
+BuildRequires: glibc-devel < 6:2.15
 BuildRequires: glibc-static
 BuildRequires: libgomp-devel
+BuildRequires: libstdc++-devel
 Obsoletes:     valgrind-callgrind
 Obsoletes:     valgrind-calltree
-ExclusiveArch: %{ix86} %{x8664} ppc ppc64
+ExclusiveArch: %{ix86} %{x8664} arm ppc ppc64 s390x
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _noautostrip    .*/vgpreload.*\\.so
@@ -43,8 +49,11 @@ również dokładne profilowanie, dzięki któremu programy zaczną szybciej
 pracować.
 
 %prep
-%setup -q -n %{name}-%{version}-%{_rel}
-%patch0 -p1
+%setup -q
+%patch0
+%patch1 -p1
+%patch2 -p0
+%patch3 -p1
 
 sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in
 
@@ -53,12 +62,16 @@ sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configur
 %{__autoheader}
 %{__autoconf}
 %{__automake}
+
+ac_cv_path_GDB=/usr/bin/gdb \
 %configure \
+       CC=gcc \
        --enable-tls \
 %if %{_lib} != "lib"
        --enable-only64bit \
 %endif
        LDFLAGS="" # no strip!
+
 %{__make}
 
 %install
@@ -67,7 +80,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/doc
 mv docs/index.pdf docs/valgrind_manual.pdf
 mv docs/index.ps docs/valgrind_manual.ps
 
@@ -78,12 +91,25 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %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}/*
-%{_includedir}/*
+%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-listener
+%attr(755,root,root) %{_bindir}/vgdb
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/*-linux
-%{_libdir}/%{name}/*.a
-%attr(755,root,root) %{_libdir}/%{name}/*.so
-%{_libdir}/%{name}/*.supp
-%{_mandir}/man1/*.1*
-%{_pkgconfigdir}/*.pc
+%attr(755,root,root) %{_libdir}/%{name}/vgpreload_*-linux.so
+%{_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/ms_print.1*
+%{_mandir}/man1/valgrind.1*
+%{_pkgconfigdir}/valgrind.pc