diff --git a/valgrind-3.7.0-glibc-2.15.patch b/valgrind-3.7.0-glibc-2.15.patch deleted file mode 100644 index bbb8cb0..0000000 --- a/valgrind-3.7.0-glibc-2.15.patch +++ /dev/null @@ -1,52 +0,0 @@ -Modified: trunk/configure.in -=================================================================== ---- trunk/configure.in 2011-12-27 18:43:32 UTC (rev 12322) -+++ trunk/configure.in 2011-12-29 08:24:55 UTC (rev 12323) -@@ -778,6 +778,13 @@ - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.15) -+ AC_MSG_RESULT(2.15 family) -+ AC_DEFINE([GLIBC_2_15], 1, [Define to 1 if you're using glibc 2.15.x]) -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - darwin) - AC_MSG_RESULT(Darwin) - AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) -@@ -791,7 +798,7 @@ - - *) - AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) -- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14]) -+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.15]) - AC_MSG_ERROR([or Darwin libc]) - ;; - esac ---- valgrind-3.7.0.orig/coregrind/Makefile.am -+++ valgrind-3.7.0/coregrind/Makefile.am -@@ -495,7 +495,8 @@ - m_gdbserver/powerpc-altivec64l.xml - - # so as to make sure these get copied into the install tree --pkglib_DATA = $(GDBSERVER_XML_FILES) -+vgdatadir = $(pkglibdir) -+vgdata_DATA = $(GDBSERVER_XML_FILES) - - # so as to make sure these get copied into the tarball - EXTRA_DIST += $(GDBSERVER_XML_FILES) -diff -Nur valgrind-3.7.0.orig/Makefile.am valgrind-3.7.0/Makefile.am ---- valgrind-3.7.0.orig/Makefile.am -+++ valgrind-3.7.0/Makefile.am -@@ -61,7 +61,8 @@ - # default.supp, as it is built from the base .supp files at compile-time. - dist_noinst_DATA = $(SUPP_FILES) - --pkglib_DATA = default.supp -+vgdatadir = $(pkglibdir) -+vgdata_DATA = default.supp - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = valgrind.pc diff --git a/valgrind-3.7.0-x86_64-fix-gcc-detection.patch b/valgrind-3.7.0-x86_64-fix-gcc-detection.patch deleted file mode 100644 index 18d54ed..0000000 --- a/valgrind-3.7.0-x86_64-fix-gcc-detection.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nru valgrind-3.7.0.orig/configure valgrind-3.7.0/configure ---- valgrind-3.7.0.orig/configure 2012-04-24 11:36:16.140356302 +0000 -+++ valgrind-3.7.0/configure 2012-04-24 11:39:35.086185118 +0000 -@@ -5133,8 +5133,9 @@ - | head -n 1 \ - | $SED 's/i686-apple-darwin10//' \ - | $SED 's/i686-apple-darwin11//' \ -+ | $SED 's/x86_64-openmamba-linux-gnu-gcc//' \ - | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'` - - is_clang="notclang" - if test "x`${CC} --version | head -n 1 | $SED 's/\(clang\) version.*/\1/'`" = "xclang" ; then - is_clang="clang" -diff -Nru valgrind-3.7.0.orig/configure.in valgrind-3.7.0/configure.in ---- valgrind-3.7.0.orig/configure.in 2011-11-05 11:13:30.000000000 +0000 -+++ valgrind-3.7.0/configure.in 2012-04-24 11:39:55.894955837 +0000 -@@ -109,6 +109,7 @@ - | head -n 1 \ - | $SED 's/i686-apple-darwin10//' \ - | $SED 's/i686-apple-darwin11//' \ -+ | $SED 's/x86_64-openmamba-linux-gnu-gcc//' \ - | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`] - - is_clang="notclang" diff --git a/valgrind.spec b/valgrind.spec index 6339bb6..a1d9b5b 100644 --- a/valgrind.spec +++ b/valgrind.spec @@ -1,7 +1,7 @@ %define perl_major_ver %(eval `perl -V:version`; echo ${version%*.[0-9]*}.0) Name: valgrind -Version: 3.24.0 +Version: 3.25.1 Release: 1mamba Summary: Valgrind Memory Debugger Group: Development/Tools @@ -10,12 +10,11 @@ Distribution: openmamba Packager: Silvan Calarco URL: https://valgrind.org/ Source: ftp://sourceware.org/pub/valgrind/valgrind-%{version}.tar.bz2 -Patch0: %{name}-3.7.0-x86_64-fix-gcc-detection.patch -Patch1: %{name}-3.7.0-glibc-2.15.patch -Patch2: valgrind-3.16.1-respect-flags-mpi.patch +Patch0: valgrind-3.16.1-respect-flags-mpi.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: libgcc BuildRequires: perl-devel ## AUTOBUILDREQ-END #BuildRequires: libmpi-devel @@ -41,26 +40,15 @@ The Valgrind distribution includes five tools: two memory error detectors, a thr Several other tools have been built with Valgrind. This package contains static libraries and header files needed for development. -%debug_package +%global __provides_exclude ^libpthread.so.0* + +%define _lto_cflags %{nil} %prep %setup -q #-D -T #:<< ___EOF -#%patch0 -p1 -#%patch1 -p1 -%patch 2 -p1 -# use our own find-requires -%define __find_provides %{_builddir}/%{name}-%{version}/find_provides.sh - -# don't provide 'libpthread.so.0' library -cat > find_provides.sh << EOF -#! /bin/sh -%{_prefix}/lib/rpm/find-provides %{buildroot} %{_target_cpu} | \ - grep -v "libpthread.so.0*" -EOF - -chmod +x find_provides.sh +%patch 0 -p1 sed -i "s|armv7|arm|" configure.ac @@ -123,6 +111,9 @@ mv -f %{buildroot}%{_defaultdocdir}/%{name} \ %doc FAQ.txt NEWS README* %changelog +* Thu Sep 18 2025 Automatic Build System 3.25.1-1mamba +- automatic version update by autodist + * Sat Nov 02 2024 Automatic Build System 3.24.0-1mamba - automatic version update by autodist