summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRadu Moisan <radu.moisan@intel.com>2013-01-22 17:29:15 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-28 12:29:30 +0000
commit77eaad86d17c6ee5acddc15ce7d9884b4c73de21 (patch)
treeee8cf1e6d9b225743105032fb93099e76658f645 /meta
parenta921ed0bc0a9fd59947858f56594af752ea03acf (diff)
downloadpoky-77eaad86d17c6ee5acddc15ce7d9884b4c73de21.tar.gz
valgrind: update to 3.8.1
Changed license copyright notice 2011->2012 remove unnecessary patches built for x86, 86-64, ppc (From OE-Core rev: df0d23c2bedafd534c5909a65afaf3373d7bc33e) Signed-off-by: Radu Moisan <radu.moisan@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-fix.patch40
-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/valgrind-3.7.0-fix-error-of-reading-debug-info.patch33
-rw-r--r--meta/recipes-devtools/valgrind/valgrind-3.8.1/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch (renamed from meta/recipes-devtools/valgrind/valgrind-3.7.0/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch)0
-rw-r--r--meta/recipes-devtools/valgrind/valgrind-3.8.1/configure-with-newer-glibc.patch (renamed from meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-with-newer-glibc.patch)13
-rw-r--r--meta/recipes-devtools/valgrind/valgrind-3.8.1/fix_issue_caused_by_ccache.patch (renamed from meta/recipes-devtools/valgrind/valgrind-3.7.0/fix_issue_caused_by_ccache.patch)0
-rw-r--r--meta/recipes-devtools/valgrind/valgrind-3.8.1/fix_unsupporting_kernel_3.patch (renamed from meta/recipes-devtools/valgrind/valgrind-3.7.0/fix_unsupporting_kernel_3.patch)0
-rw-r--r--meta/recipes-devtools/valgrind/valgrind-3.8.1/fixed-perl-path.patch (renamed from meta/recipes-devtools/valgrind/valgrind-3.7.0/fixed-perl-path.patch)0
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.8.1.bb (renamed from meta/recipes-devtools/valgrind/valgrind_3.7.0.bb)13
9 files changed, 11 insertions, 133 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-fix.patch b/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-fix.patch
deleted file mode 100644
index 1f4bd7ef40..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1To recognize gcc version from poky in configure.in
2Added GLIBC 2.15 stanza to supported GLIBCs
3
4Upstream-Status: Inappropriate [configuration]
5
6Signed-off-by: Shane Wang <shane.wang@intel.com>
7Signed-off-by: Saul Wold <sgw@linux.intel.com>
8
9Index: valgrind-3.7.0/configure.in
10===================================================================
11--- valgrind-3.7.0.orig/configure.in
12+++ valgrind-3.7.0/configure.in
13@@ -104,11 +104,13 @@ AC_MSG_CHECKING([for a supported version
14 #
15 # i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
16 # i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
17+# ARCH-VENDOR-OS-gcc (GCC) VERSION Copyright
18 #
19 [gcc_version=`${CC} --version \
20 | head -n 1 \
21 | $SED 's/i686-apple-darwin10//' \
22 | $SED 's/i686-apple-darwin11//' \
23+ | $SED 's/.*GCC[^0-9]*//' \
24 | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`]
25
26 is_clang="notclang"
27@@ -779,6 +781,13 @@ case "${GLIBC_VERSION}" in
28 DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
29 DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
30 ;;
31+ 2.15)
32+ AC_MSG_RESULT(2.15 family)
33+ AC_DEFINE([GLIBC_2_15], 1, [Define to 1 if you're using glibc 2.15.x])
34+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
35+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
36+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
37+ ;;
38 darwin)
39 AC_MSG_RESULT(Darwin)
40 AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
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
deleted file mode 100644
index 866facfeb2..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind-3.7.0/fix_for_automake_1.11.2.patch
+++ /dev/null
@@ -1,45 +0,0 @@
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/valgrind-3.7.0-fix-error-of-reading-debug-info.patch b/meta/recipes-devtools/valgrind/valgrind-3.7.0/valgrind-3.7.0-fix-error-of-reading-debug-info.patch
deleted file mode 100644
index b1626f0b0f..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind-3.7.0/valgrind-3.7.0-fix-error-of-reading-debug-info.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1Upstream-Status: Pending
2
3fix debug info reading error when do memcheck on ppc targets
4 following is the error message:
5 --2263-- WARNING: Serious error when reading debug info
6 --2263-- When reading debug info from /lib/ld-2.13.so:
7 --2263-- Can't make sense of .got section mapping
8 --2263-- WARNING: Serious error when reading debug info
9 --2263-- When reading debug info from /home/root/lzh:
10 --2263-- Can't make sense of .data section mapping
11 --2263-- WARNING: Serious error when reading debug info
12 --2263-- When reading debug info from /usr/lib/valgrind/vgpreload_core-ppc32-linux.so:
13 --2263-- Can't make sense of .data section mapping
14 --2263-- WARNING: Serious error when reading debug info
15 --2263-- When reading debug info from /usr/lib/valgrind/vgpreload_memcheck-ppc32-linux.so:
16 --2263-- Can't make sense of .data section mapping
17 --2263-- WARNING: Serious error when reading debug info
18 --2263-- When reading debug info from /lib/libc-2.13.so:
19 --2263-- Can't make sense of .data section mapping
20
21Signed-off-by: Zhenhua Luo <b19537@freescale.com>
22
23--- a/coregrind/m_debuginfo/readelf.c 2012-09-11 21:45:36.696462313 -0500
24+++ b/coregrind/m_debuginfo/readelf.c 2012-09-11 21:45:49.913463615 -0500
25@@ -1539,7 +1539,7 @@
26 && phdr->p_offset < di->fsm.rw_map_foff + di->fsm.rw_map_size
27 && phdr->p_offset + phdr->p_filesz
28 <= di->fsm.rw_map_foff + di->fsm.rw_map_size
29- && (phdr->p_flags & (PF_R | PF_W | PF_X)) == (PF_R | PF_W)) {
30+ && (phdr->p_flags & (PF_R | PF_W | PF_X)) >= (PF_R | PF_W)) {
31 if (n_rw == N_RX_RW_AREAS) {
32 ML_(symerr)(di, True,
33 "N_RX_RW_AREAS is too low; "
diff --git a/meta/recipes-devtools/valgrind/valgrind-3.7.0/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch b/meta/recipes-devtools/valgrind/valgrind-3.8.1/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch
index 07774f38a9..07774f38a9 100644
--- a/meta/recipes-devtools/valgrind/valgrind-3.7.0/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch
+++ b/meta/recipes-devtools/valgrind/valgrind-3.8.1/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-with-newer-glibc.patch b/meta/recipes-devtools/valgrind/valgrind-3.8.1/configure-with-newer-glibc.patch
index b369de8901..d3cea234cb 100644
--- a/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-with-newer-glibc.patch
+++ b/meta/recipes-devtools/valgrind/valgrind-3.8.1/configure-with-newer-glibc.patch
@@ -2,13 +2,14 @@ Add case for glibc 2.16 and correct error message to denote support until 2.16
2 2
3Signed-off-by: Khem Raj <raj.khem@gmail.com> 3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4Signed-off-by: Saul Wold <sgw@linux.intel.com> 4Signed-off-by: Saul Wold <sgw@linux.intel.com>
5Signed-off-by: Radu Moisan <radu.moisan@intel.com>
5 6
6Upstream-Status: Pending 7Upstream-Status: Pending
7Index: valgrind-3.7.0/configure.in 8Index: valgrind-3.8.1/configure.in
8=================================================================== 9===================================================================
9--- valgrind-3.7.0.orig/configure.in 10--- valgrind-3.8.1.orig/configure.in
10+++ valgrind-3.7.0/configure.in 11+++ valgrind-3.8.1/configure.in
11@@ -788,6 +788,20 @@ case "${GLIBC_VERSION}" in 12@@ -910,6 +910,20 @@ case "${GLIBC_VERSION}" in
12 DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" 13 DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
13 DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" 14 DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
14 ;; 15 ;;
@@ -29,11 +30,11 @@ Index: valgrind-3.7.0/configure.in
29 darwin) 30 darwin)
30 AC_MSG_RESULT(Darwin) 31 AC_MSG_RESULT(Darwin)
31 AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) 32 AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
32@@ -801,7 +815,7 @@ case "${GLIBC_VERSION}" in 33@@ -923,7 +937,7 @@ case "${GLIBC_VERSION}" in
33 34
34 *) 35 *)
35 AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) 36 AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
36- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14]) 37- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16])
37+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.17]) 38+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.17])
38 AC_MSG_ERROR([or Darwin libc]) 39 AC_MSG_ERROR([or Darwin libc])
39 ;; 40 ;;
diff --git a/meta/recipes-devtools/valgrind/valgrind-3.7.0/fix_issue_caused_by_ccache.patch b/meta/recipes-devtools/valgrind/valgrind-3.8.1/fix_issue_caused_by_ccache.patch
index 4658567b21..4658567b21 100644
--- a/meta/recipes-devtools/valgrind/valgrind-3.7.0/fix_issue_caused_by_ccache.patch
+++ b/meta/recipes-devtools/valgrind/valgrind-3.8.1/fix_issue_caused_by_ccache.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind-3.7.0/fix_unsupporting_kernel_3.patch b/meta/recipes-devtools/valgrind/valgrind-3.8.1/fix_unsupporting_kernel_3.patch
index 346ffebb3d..346ffebb3d 100644
--- a/meta/recipes-devtools/valgrind/valgrind-3.7.0/fix_unsupporting_kernel_3.patch
+++ b/meta/recipes-devtools/valgrind/valgrind-3.8.1/fix_unsupporting_kernel_3.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind-3.7.0/fixed-perl-path.patch b/meta/recipes-devtools/valgrind/valgrind-3.8.1/fixed-perl-path.patch
index b054d05f7f..b054d05f7f 100644
--- a/meta/recipes-devtools/valgrind/valgrind-3.7.0/fixed-perl-path.patch
+++ b/meta/recipes-devtools/valgrind/valgrind-3.8.1/fixed-perl-path.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.8.1.bb
index 690652a9a8..75c3e73731 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.8.1.bb
@@ -3,8 +3,8 @@ HOMEPAGE = "http://valgrind.org/"
3BUGTRACKER = "http://valgrind.org/support/bug_reports.html" 3BUGTRACKER = "http://valgrind.org/support/bug_reports.html"
4LICENSE = "GPLv2 & GPLv2+ & BSD" 4LICENSE = "GPLv2 & GPLv2+ & BSD"
5LIC_FILES_CHKSUM = "file://COPYING;md5=c46082167a314d785d012a244748d803 \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=c46082167a314d785d012a244748d803 \
6 file://include/pub_tool_basics.h;beginline=1;endline=29;md5=0ef036a7ddce4cdc738d65d63b3e8153 \ 6 file://include/pub_tool_basics.h;beginline=1;endline=29;md5=6b18ba0139d10678ce3a9969f68e4c6d \
7 file://include/valgrind.h;beginline=1;endline=56;md5=aee56014c1dd64260a59fd4df38752f6 \ 7 file://include/valgrind.h;beginline=1;endline=56;md5=b6bb5ab625a759823e17197ec3e2ee83 \
8 file://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215" 8 file://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215"
9 9
10X11DEPENDS = "virtual/libx11" 10X11DEPENDS = "virtual/libx11"
@@ -15,17 +15,12 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
15 file://fix_issue_caused_by_ccache.patch \ 15 file://fix_issue_caused_by_ccache.patch \
16 file://fix_unsupporting_kernel_3.patch \ 16 file://fix_unsupporting_kernel_3.patch \
17 file://fixed-perl-path.patch \ 17 file://fixed-perl-path.patch \
18 file://fix_for_automake_1.11.2.patch \
19 file://configure-fix.patch \
20 file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \ 18 file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \
21 file://configure-with-newer-glibc.patch \ 19 file://configure-with-newer-glibc.patch \
22 " 20 "
23 21
24SRC_URI_append_powerpc = " file://valgrind-3.7.0-fix-error-of-reading-debug-info.patch" 22SRC_URI[md5sum] = "288758010b271119a0ffc0183f1d6e38"
25SRC_URI_append_powerpc64 = " file://valgrind-3.7.0-fix-error-of-reading-debug-info.patch" 23SRC_URI[sha256sum] = "473be00576bed311a662b277a2bfbe97d9cca4058e68619a0e420c9fc19958db"
26
27SRC_URI[md5sum] = "a855fda56edf05614f099dca316d1775"
28SRC_URI[sha256sum] = "5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6"
29 24
30COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64).*-linux' 25COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64).*-linux'
31COMPATIBLE_HOST_armv7a = 'arm.*-linux' 26COMPATIBLE_HOST_armv7a = 'arm.*-linux'