Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/blueness:master commit in: dev-util/valgrind/, dev-util/valgrind/files/
Date: Sat, 07 Jan 2012 01:12:06
Message-Id: 40460f9958d21370ecb7af665f0a93f2ca1fa4a7.blueness@gentoo
1 commit: 40460f9958d21370ecb7af665f0a93f2ca1fa4a7
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 7 01:11:40 2012 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 7 01:11:40 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=40460f99
7
8 dev-util/valgrind: testing patch from https://bugs.kde.org/show_bug.cgi?id=290719
9
10 ---
11 dev-util/valgrind/ChangeLog | 8 +++++
12 .../files/valgrind-3.7.0-automake-1.11.2.patch | 33 ++++++++++++++------
13 2 files changed, 31 insertions(+), 10 deletions(-)
14
15 diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
16 new file mode 100644
17 index 0000000..c555d56
18 --- /dev/null
19 +++ b/dev-util/valgrind/ChangeLog
20 @@ -0,0 +1,8 @@
21 +# ChangeLog for dev-util/valgrind
22 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
23 +# $Header: $
24 +
25 + 07 Jan 2012; Anthony G. Basile <blueness@g.o>
26 + files/valgrind-3.7.0-automake-1.11.2.patch:
27 + Testing patch from https://bugs.kde.org/show_bug.cgi?id=290719
28 +
29
30 diff --git a/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch b/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch
31 index 2c286f9..b0b57bf 100644
32 --- a/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch
33 +++ b/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch
34 @@ -1,24 +1,37 @@
35 -diff -Naur valgrind-3.7.0.orig//coregrind/Makefile.am valgrind-3.7.0/coregrind/Makefile.am
36 ---- valgrind-3.7.0.orig//coregrind/Makefile.am 2012-01-04 22:46:34.000000000 -0500
37 -+++ valgrind-3.7.0/coregrind/Makefile.am 2012-01-04 22:48:51.000000000 -0500
38 -@@ -495,7 +495,7 @@
39 +From: Gregorio Guidi <gregorio.guidi@×××××.com>
40 +
41 +Retain the old behavior of the build system even with automake 1.11.2.
42 +
43 +Reported-by: Oleg Bulatov <dmage@××.ru>
44 +X-Gentoo-Bug: 397429
45 +X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=397429
46 +X-KDE-Bug: 290719
47 +X-KDE-Bug-URL: https://bugs.kde.org/show_bug.cgi?id=290719
48 +Signed-off-by: Anthony G. Basile <blueness@g.o>
49 +
50 +diff -Nur valgrind-3.7.0.orig/coregrind/Makefile.am valgrind-3.7.0/coregrind/Makefile.am
51 +--- valgrind-3.7.0.orig/coregrind/Makefile.am 2011-10-27 12:55:06.000000000 +0200
52 ++++ valgrind-3.7.0/coregrind/Makefile.am 2012-01-06 17:23:48.717115986 +0100
53 +@@ -495,7 +495,8 @@
54 m_gdbserver/powerpc-altivec64l.xml
55
56 # so as to make sure these get copied into the install tree
57 -pkglib_DATA = $(GDBSERVER_XML_FILES)
58 -+pkgdata_DATA = $(GDBSERVER_XML_FILES)
59 ++vgdatadir = $(pkglibdir)
60 ++vgdata_DATA = $(GDBSERVER_XML_FILES)
61
62 # so as to make sure these get copied into the tarball
63 EXTRA_DIST += $(GDBSERVER_XML_FILES)
64 -diff -Naur valgrind-3.7.0.orig//Makefile.am valgrind-3.7.0/Makefile.am
65 ---- valgrind-3.7.0.orig//Makefile.am 2011-10-26 17:24:45.000000000 -0400
66 -+++ valgrind-3.7.0/Makefile.am 2012-01-04 22:48:58.000000000 -0500
67 -@@ -61,7 +61,7 @@
68 +diff -Nur valgrind-3.7.0.orig/Makefile.am valgrind-3.7.0/Makefile.am
69 +--- valgrind-3.7.0.orig/Makefile.am 2011-10-26 23:24:45.000000000 +0200
70 ++++ valgrind-3.7.0/Makefile.am 2012-01-06 17:23:17.445114847 +0100
71 +@@ -61,7 +61,8 @@
72 # default.supp, as it is built from the base .supp files at compile-time.
73 dist_noinst_DATA = $(SUPP_FILES)
74
75 -pkglib_DATA = default.supp
76 -+pkgdata_DATA = default.supp
77 ++vgdatadir = $(pkglibdir)
78 ++vgdata_DATA = default.supp
79
80 pkgconfigdir = $(libdir)/pkgconfig
81 pkgconfig_DATA = valgrind.pc