From 3a93a74dbd7a6a6ef7e08b03307166c6c136b0ad Mon Sep 17 00:00:00 2001 From: Jacek Konieczny Date: Mon, 23 Jan 2012 11:07:09 +0000 Subject: [PATCH] - automake 1.11.2 compatibility patch - more specific glibc dependency - Release: 2 Changed files: valgrind-automake-1.11.2.patch -> 1.1 valgrind.spec -> 1.85 --- valgrind-automake-1.11.2.patch | 25 +++++++++++++++++++++++++ valgrind.spec | 6 +++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 valgrind-automake-1.11.2.patch diff --git a/valgrind-automake-1.11.2.patch b/valgrind-automake-1.11.2.patch new file mode 100644 index 0000000..2ef48a2 --- /dev/null +++ b/valgrind-automake-1.11.2.patch @@ -0,0 +1,25 @@ +https://bugs.kde.org/show_bug.cgi?id=290719 +--- coregrind/Makefile.am 2011-10-27 12:55:06.000000000 +0200 ++++ coregrind/Makefile.am 2012-01-06 17:23:48.717115986 +0100 +@@ -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) +--- Makefile.am 2011-10-26 23:24:45.000000000 +0200 ++++ Makefile.am 2012-01-06 17:23:17.445114847 +0100 +@@ -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.spec b/valgrind.spec index 33f2d47..761f413 100644 --- a/valgrind.spec +++ b/valgrind.spec @@ -4,18 +4,21 @@ Summary: An open-source memory debugger Summary(pl.UTF-8): Otwarty odpluskwiacz pamięci Name: valgrind Version: 3.7.0 -Release: 1 +Release: 2 License: GPL Group: Development/Tools 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 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 @@ -48,6 +51,7 @@ pracować. %setup -q %patch0 %patch1 -p1 +%patch2 -p0 sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in -- 2.43.0