1 files changed, 45 insertions, 0 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 @@
+Upstream-Status: Pending
+automake version 1.11.2 has made use of dir variables more strict.
+the use of pkglibdir with DATA var results in automake errors.
+This commits uses pkgdatadir var instead of pkglibdir to avoid 
+the strict check errors.
+RP 2012/1/4
+Index: valgrind-3.7.0/Makefile.am
+===================================================================
+--- valgrind-3.7.0.orig/Makefile.am     2012-01-04 15:55:07.034044860 +0000
+++ valgrind-3.7.0/Makefile.am  2012-01-04 15:55:55.034035120 +0000
+@@ -61,7 +61,7 @@
+ # default.supp, as it is built from the base .supp files at compile-time.
+ dist_noinst_DATA = $(SUPP_FILES)
+ 
+-pkglib_DATA = default.supp
+pkgdata_DATA = default.supp
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = valgrind.pc
+Index: valgrind-3.7.0/coregrind/Makefile.am
+===================================================================
+--- valgrind-3.7.0.orig/coregrind/Makefile.am   2012-01-04 15:55:02.090043851 +0000
+++ valgrind-3.7.0/coregrind/Makefile.am        2012-01-04 15:55:30.270044097 +0000
+@@ -495,7 +495,7 @@
+        m_gdbserver/powerpc-altivec64l.xml
+ 
+ # so as to make sure these get copied into the install tree
+-pkglib_DATA  = $(GDBSERVER_XML_FILES)
+pkgdata_DATA  = $(GDBSERVER_XML_FILES)
+ 
+ # so as to make sure these get copied into the tarball
+ EXTRA_DIST  += $(GDBSERVER_XML_FILES)
+@@ -506,7 +506,7 @@
+ 
+ all-local: inplace-noinst_PROGRAMS inplace-noinst_DSYMS
+        mkdir -p $(inplacedir); \
+-       for f in $(pkglib_DATA); do \
+       for f in $(pkgdata_DATA); do \
+          rm -f $(inplacedir)/$$f; \
+          ln -f -s ../$(subdir)/$$f $(inplacedir); \
+        done

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 @@
	1	Upstream-Status: Pending
	2
	3	automake version 1.11.2 has made use of dir variables more strict.
	4	the use of pkglibdir with DATA var results in automake errors.
	5
	6	This commits uses pkgdatadir var instead of pkglibdir to avoid
	7	the strict check errors.
	8
	9	RP 2012/1/4
	10
	11	Index: 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
	24	Index: 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