summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/valgrind
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-04 16:01:56 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-04 16:04:08 +0000
commit021848be9eeb71de8acfba6c66c11645b01523b8 (patch)
tree011a5043506e7e80b979f291e60112f17eb1c04d /meta/recipes-devtools/valgrind
parent51d64452f65e247321691243be304e92c19d3339 (diff)
downloadpoky-021848be9eeb71de8acfba6c66c11645b01523b8.tar.gz
valgrind: Fix for automake update
(From OE-Core rev: f309769d10cb3d8b72b8c7c4f7f418dcb8422c61) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/valgrind')
-rw-r--r--meta/recipes-devtools/valgrind/valgrind-3.7.0/fix_for_automake_1.11.2.patch45
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.7.0.bb3
2 files changed, 47 insertions, 1 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind-3.7.0/fix_for_automake_1.11.2.patch b/meta/recipes-devtools/valgrind/valgrind-3.7.0/fix_for_automake_1.11.2.patch
new file mode 100644
index 0000000000..866facfeb2
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind-3.7.0/fix_for_automake_1.11.2.patch
@@ -0,0 +1,45 @@
1Upstream-Status: Pending
2
3automake version 1.11.2 has made use of dir variables more strict.
4the use of pkglibdir with DATA var results in automake errors.
5
6This commits uses pkgdatadir var instead of pkglibdir to avoid
7the strict check errors.
8
9RP 2012/1/4
10
11Index: valgrind-3.7.0/Makefile.am
12===================================================================
13--- valgrind-3.7.0.orig/Makefile.am 2012-01-04 15:55:07.034044860 +0000
14+++ valgrind-3.7.0/Makefile.am 2012-01-04 15:55:55.034035120 +0000
15@@ -61,7 +61,7 @@
16 # default.supp, as it is built from the base .supp files at compile-time.
17 dist_noinst_DATA = $(SUPP_FILES)
18
19-pkglib_DATA = default.supp
20+pkgdata_DATA = default.supp
21
22 pkgconfigdir = $(libdir)/pkgconfig
23 pkgconfig_DATA = valgrind.pc
24Index: valgrind-3.7.0/coregrind/Makefile.am
25===================================================================
26--- valgrind-3.7.0.orig/coregrind/Makefile.am 2012-01-04 15:55:02.090043851 +0000
27+++ valgrind-3.7.0/coregrind/Makefile.am 2012-01-04 15:55:30.270044097 +0000
28@@ -495,7 +495,7 @@
29 m_gdbserver/powerpc-altivec64l.xml
30
31 # so as to make sure these get copied into the install tree
32-pkglib_DATA = $(GDBSERVER_XML_FILES)
33+pkgdata_DATA = $(GDBSERVER_XML_FILES)
34
35 # so as to make sure these get copied into the tarball
36 EXTRA_DIST += $(GDBSERVER_XML_FILES)
37@@ -506,7 +506,7 @@
38
39 all-local: inplace-noinst_PROGRAMS inplace-noinst_DSYMS
40 mkdir -p $(inplacedir); \
41- for f in $(pkglib_DATA); do \
42+ for f in $(pkgdata_DATA); do \
43 rm -f $(inplacedir)/$$f; \
44 ln -f -s ../$(subdir)/$$f $(inplacedir); \
45 done
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
index 03cdd28aff..f4f3131c58 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
@@ -7,12 +7,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c46082167a314d785d012a244748d803 \
7 file://include/valgrind.h;beginline=1;endline=56;md5=aee56014c1dd64260a59fd4df38752f6 \ 7 file://include/valgrind.h;beginline=1;endline=56;md5=aee56014c1dd64260a59fd4df38752f6 \
8 file://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215" 8 file://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215"
9DEPENDS = "virtual/libx11" 9DEPENDS = "virtual/libx11"
10PR = "r0" 10PR = "r1"
11 11
12SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ 12SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
13 file://fix_issue_caused_by_ccache.patch \ 13 file://fix_issue_caused_by_ccache.patch \
14 file://fix_unsupporting_kernel_3.patch \ 14 file://fix_unsupporting_kernel_3.patch \
15 file://fixed-perl-path.patch \ 15 file://fixed-perl-path.patch \
16 file://fix_for_automake_1.11.2.patch \
16 file://configure-fix.patch" 17 file://configure-fix.patch"
17 18
18SRC_URI[md5sum] = "a855fda56edf05614f099dca316d1775" 19SRC_URI[md5sum] = "a855fda56edf05614f099dca316d1775"