summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/valgrind/valgrind-3.8.1/configure-with-newer-glibc.patch41
-rw-r--r--meta/recipes-devtools/valgrind/valgrind-3.8.1/eglibc-2.18.patch27
-rw-r--r--meta/recipes-devtools/valgrind/valgrind-3.8.1/fix_issue_caused_by_ccache.patch32
-rw-r--r--meta/recipes-devtools/valgrind/valgrind-3.8.1/fix_unsupporting_kernel_3.patch26
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch (renamed from meta/recipes-devtools/valgrind/valgrind-3.8.1/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch)0
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch (renamed from meta/recipes-devtools/valgrind/valgrind-3.8.1/fixed-perl-path.patch)0
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/sepbuildfix.patch (renamed from meta/recipes-devtools/valgrind/valgrind-3.8.1/sepbuildfix.patch)26
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.9.0.bb (renamed from meta/recipes-devtools/valgrind/valgrind_3.8.1.bb)12
8 files changed, 17 insertions, 147 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind-3.8.1/configure-with-newer-glibc.patch b/meta/recipes-devtools/valgrind/valgrind-3.8.1/configure-with-newer-glibc.patch
deleted file mode 100644
index d3cea234cb..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind-3.8.1/configure-with-newer-glibc.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1Add case for glibc 2.16 and correct error message to denote support until 2.16
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4Signed-off-by: Saul Wold <sgw@linux.intel.com>
5Signed-off-by: Radu Moisan <radu.moisan@intel.com>
6
7Upstream-Status: Pending
8Index: valgrind-3.8.1/configure.in
9===================================================================
10--- valgrind-3.8.1.orig/configure.in
11+++ valgrind-3.8.1/configure.in
12@@ -910,6 +910,20 @@ case "${GLIBC_VERSION}" in
13 DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
14 DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
15 ;;
16+ 2.16)
17+ AC_MSG_RESULT(2.16 family)
18+ AC_DEFINE([GLIBC_2_16], 1, [Define to 1 if you're using glibc 2.16.x])
19+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
20+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
21+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
22+ ;;
23+ 2.17)
24+ AC_MSG_RESULT(2.17 family)
25+ AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.x])
26+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
27+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
28+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
29+ ;;
30 darwin)
31 AC_MSG_RESULT(Darwin)
32 AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
33@@ -923,7 +937,7 @@ case "${GLIBC_VERSION}" in
34
35 *)
36 AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
37- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16])
38+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.17])
39 AC_MSG_ERROR([or Darwin libc])
40 ;;
41 esac
diff --git a/meta/recipes-devtools/valgrind/valgrind-3.8.1/eglibc-2.18.patch b/meta/recipes-devtools/valgrind/valgrind-3.8.1/eglibc-2.18.patch
deleted file mode 100644
index 1fa8127302..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind-3.8.1/eglibc-2.18.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1
2
3Found in the SVN valgrind code
4svn diff -c 13504 configure.in
5
6Upstream-Status: Backport
7
8Signed-off-by: Saul Wold <sgw@linux.intel.com>
9
10Index: valgrind-3.8.1/configure.in
11===================================================================
12--- valgrind-3.8.1.orig/configure.in
13+++ valgrind-3.8.1/configure.in
14@@ -924,6 +924,13 @@ case "${GLIBC_VERSION}" in
15 DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
16 DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
17 ;;
18+ 2.18)
19+ AC_MSG_RESULT(2.18 family)
20+ AC_DEFINE([GLIBC_2_18], 1, [Define to 1 if you're using glibc 2.18.x])
21+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
22+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
23+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
24+ ;;
25 darwin)
26 AC_MSG_RESULT(Darwin)
27 AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
diff --git a/meta/recipes-devtools/valgrind/valgrind-3.8.1/fix_issue_caused_by_ccache.patch b/meta/recipes-devtools/valgrind/valgrind-3.8.1/fix_issue_caused_by_ccache.patch
deleted file mode 100644
index 4658567b21..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind-3.8.1/fix_issue_caused_by_ccache.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1The script does not expect use of ccache, hence fix it to recognise it.
2
32010/08/17
4Nitin A Kamble <nitin.a.kamble@intel.com>
5
6Upstream-Status: Inappropriate [configuration]
7
8Index: valgrind-3.5.0/coregrind/link_tool_exe_linux.in
9===================================================================
10--- valgrind-3.5.0.orig/coregrind/link_tool_exe_linux.in
11+++ valgrind-3.5.0/coregrind/link_tool_exe_linux.in
12@@ -62,6 +62,11 @@ die "Bogus alt-load address"
13
14 # The cc invokation to do the final link
15 my $cc = $ARGV[1];
16+my $next = 2;
17+if ("$cc" eq "ccache") {
18+ $cc = "$cc $ARGV[2]";
19+ $next = 3;
20+}
21
22 # and the 'restargs' are argv[2 ..]
23
24@@ -71,7 +76,7 @@ my $cc = $ARGV[1];
25 my $cmd="$cc -static -Wl,-Ttext=$ala";
26
27 # Add the rest of the parameters
28-foreach my $n (2 .. $#ARGV) {
29+foreach my $n ($next .. $#ARGV) {
30 $cmd = "$cmd $ARGV[$n]";
31 }
32
diff --git a/meta/recipes-devtools/valgrind/valgrind-3.8.1/fix_unsupporting_kernel_3.patch b/meta/recipes-devtools/valgrind/valgrind-3.8.1/fix_unsupporting_kernel_3.patch
deleted file mode 100644
index 346ffebb3d..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind-3.8.1/fix_unsupporting_kernel_3.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1valgrind: Add 3.x statements to "case" for supporting the kernel 3.x
2
3Signed-off-by: Lin Tong <tong.lin@intel.com>
4
5Upstream-Status: Pending
6
7diff --git a/configure.in b/configure.in
8index 3878619..1cb7dc7 100644
9--- a/configure.in
10+++ b/configure.in
11@@ -229,10 +229,14 @@ case "${host_os}" in
12 AC_MSG_RESULT([2.4 family (${kernel})])
13 AC_DEFINE([KERNEL_2_4], 1, [Define to 1 if you're using Linux 2.4.x])
14 ;;
15+ 3.*)
16+ AC_MSG_RESULT([3 family (${kernel})])
17+ AC_DEFINE([KERNEL_3], 1, [Define to 1 if you're using Linux 3.x])
18+ ;;
19
20 *)
21 AC_MSG_RESULT([unsupported (${kernel})])
22- AC_MSG_ERROR([Valgrind works on kernels 2.4, 2.6])
23+ AC_MSG_ERROR([Valgrind works on kernels 2.4, 2.6, 3.x])
24 ;;
25 esac
26
diff --git a/meta/recipes-devtools/valgrind/valgrind-3.8.1/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch b/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch
index 07774f38a9..07774f38a9 100644
--- a/meta/recipes-devtools/valgrind/valgrind-3.8.1/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind-3.8.1/fixed-perl-path.patch b/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch
index b054d05f7f..b054d05f7f 100644
--- a/meta/recipes-devtools/valgrind/valgrind-3.8.1/fixed-perl-path.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind-3.8.1/sepbuildfix.patch b/meta/recipes-devtools/valgrind/valgrind/sepbuildfix.patch
index fe3f8da18d..5db0ef8a3f 100644
--- a/meta/recipes-devtools/valgrind/valgrind-3.8.1/sepbuildfix.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/sepbuildfix.patch
@@ -6,11 +6,11 @@ RP 2013/03/23
6 6
7Upstream-Status: Pending 7Upstream-Status: Pending
8 8
9Index: valgrind-3.8.1/configure.in 9Index: valgrind-3.9.0/configure.ac
10=================================================================== 10===================================================================
11--- valgrind-3.8.1.orig/configure.in 2013-03-23 16:06:58.388793432 +0000 11--- valgrind-3.9.0.orig/configure.ac
12+++ valgrind-3.8.1/configure.in 2013-03-23 16:46:15.088737377 +0000 12+++ valgrind-3.9.0/configure.ac
13@@ -316,26 +316,26 @@ 13@@ -325,26 +325,26 @@ case "${host_os}" in
14 9.*) 14 9.*)
15 AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard]) 15 AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard])
16 AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version]) 16 AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version])
@@ -45,7 +45,7 @@ Index: valgrind-3.8.1/configure.in
45 ;; 45 ;;
46 *) 46 *)
47 AC_MSG_RESULT([unsupported (${kernel})]) 47 AC_MSG_RESULT([unsupported (${kernel})])
48@@ -805,124 +805,124 @@ 48@@ -799,124 +799,124 @@ case "${GLIBC_VERSION}" in
49 2.2) 49 2.2)
50 AC_MSG_RESULT(2.2 family) 50 AC_MSG_RESULT(2.2 family)
51 AC_DEFINE([GLIBC_2_2], 1, [Define to 1 if you're using glibc 2.2.x]) 51 AC_DEFINE([GLIBC_2_2], 1, [Define to 1 if you're using glibc 2.2.x])
@@ -189,18 +189,18 @@ Index: valgrind-3.8.1/configure.in
189+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" 189+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
190+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" 190+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
191 ;; 191 ;;
192 2.16) 192 2.17)
193 AC_MSG_RESULT(2.16 family) 193 AC_MSG_RESULT(2.17 family)
194 AC_DEFINE([GLIBC_2_16], 1, [Define to 1 if you're using glibc 2.16.x]) 194 AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.x])
195 DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" 195 DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
196- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" 196- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
197- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" 197- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
198+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" 198+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
199+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" 199+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
200 ;; 200 ;;
201 2.17) 201 2.18)
202 AC_MSG_RESULT(2.17 family) 202 AC_MSG_RESULT(2.18 family)
203 AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.x]) 203 AC_DEFINE([GLIBC_2_18], 1, [Define to 1 if you're using glibc 2.18.x])
204 DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" 204 DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
205- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" 205- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
206- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" 206- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
@@ -209,7 +209,7 @@ Index: valgrind-3.8.1/configure.in
209 ;; 209 ;;
210 darwin) 210 darwin)
211 AC_MSG_RESULT(Darwin) 211 AC_MSG_RESULT(Darwin)
212@@ -932,7 +932,7 @@ 212@@ -926,7 +926,7 @@ case "${GLIBC_VERSION}" in
213 bionic) 213 bionic)
214 AC_MSG_RESULT(Bionic) 214 AC_MSG_RESULT(Bionic)
215 AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic]) 215 AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic])
@@ -218,7 +218,7 @@ Index: valgrind-3.8.1/configure.in
218 ;; 218 ;;
219 219
220 *) 220 *)
221@@ -949,11 +949,11 @@ 221@@ -943,11 +943,11 @@ AC_SUBST(GLIBC_VERSION)
222 # attempt to detect whether such libraries are installed on the 222 # attempt to detect whether such libraries are installed on the
223 # build machine (or even if any X facilities are present); just 223 # build machine (or even if any X facilities are present); just
224 # add the suppressions antidisirregardless. 224 # add the suppressions antidisirregardless.
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.8.1.bb b/meta/recipes-devtools/valgrind/valgrind_3.9.0.bb
index 9630960fee..80aac62789 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.8.1.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.9.0.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=6b18ba0139d10678ce3a9969f68e4c6d \ 6 file://include/pub_tool_basics.h;beginline=1;endline=29;md5=e7071929a50d4b0fc27a3014b315b0f7 \
7 file://include/valgrind.h;beginline=1;endline=56;md5=b6bb5ab625a759823e17197ec3e2ee83 \ 7 file://include/valgrind.h;beginline=1;endline=56;md5=92df8a1bde56fe2af70931ff55f6622f \
8 file://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215" 8 file://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215"
9 9
10X11DEPENDS = "virtual/libx11" 10X11DEPENDS = "virtual/libx11"
@@ -12,17 +12,13 @@ DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
12PR = "r8" 12PR = "r8"
13 13
14SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ 14SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
15 file://fix_issue_caused_by_ccache.patch \
16 file://fix_unsupporting_kernel_3.patch \
17 file://fixed-perl-path.patch \ 15 file://fixed-perl-path.patch \
18 file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \ 16 file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \
19 file://configure-with-newer-glibc.patch \
20 file://sepbuildfix.patch \ 17 file://sepbuildfix.patch \
21 file://eglibc-2.18.patch \
22 " 18 "
23 19
24SRC_URI[md5sum] = "288758010b271119a0ffc0183f1d6e38" 20SRC_URI[md5sum] = "0947de8112f946b9ce64764af7be6df2"
25SRC_URI[sha256sum] = "473be00576bed311a662b277a2bfbe97d9cca4058e68619a0e420c9fc19958db" 21SRC_URI[sha256sum] = "e6af71a06bc2534541b07743e1d58dc3caf744f38205ca3e5b5a0bdf372ed6f0"
26 22
27COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64).*-linux' 23COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64).*-linux'
28COMPATIBLE_HOST_armv7a = 'arm.*-linux' 24COMPATIBLE_HOST_armv7a = 'arm.*-linux'