summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/valgrind
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 23:28:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commitbb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch)
tree76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-devtools/valgrind
parentfcc456ee4b8f619134abb4649db53c638074082c (diff)
downloadpoky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz
Convert to new override syntax
This is the result of automated script conversion: scripts/contrib/convert-overrides.py <oe-core directory> converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) 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.17.0.bb56
1 files changed, 28 insertions, 28 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.17.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.17.0.bb
index 60b248681e..3f8a34becc 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.17.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.17.0.bb
@@ -54,7 +54,7 @@ COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64).*-linux'
54 54
55# patch 0001-memcheck-vgtests-remove-fullpath-after-flags.patch removes relative path 55# patch 0001-memcheck-vgtests-remove-fullpath-after-flags.patch removes relative path
56# argument. Change expected stderr files accordingly. 56# argument. Change expected stderr files accordingly.
57do_patch_append() { 57do_patch:append() {
58 bb.build.exec_func('do_sed_paths', d) 58 bb.build.exec_func('do_sed_paths', d)
59} 59}
60 60
@@ -64,23 +64,23 @@ do_sed_paths() {
64} 64}
65 65
66# valgrind supports armv7 and above 66# valgrind supports armv7 and above
67COMPATIBLE_HOST_armv4 = 'null' 67COMPATIBLE_HOST:armv4 = 'null'
68COMPATIBLE_HOST_armv5 = 'null' 68COMPATIBLE_HOST:armv5 = 'null'
69COMPATIBLE_HOST_armv6 = 'null' 69COMPATIBLE_HOST:armv6 = 'null'
70 70
71# valgrind fails with powerpc soft-float 71# valgrind fails with powerpc soft-float
72COMPATIBLE_HOST_powerpc = "${@bb.utils.contains('TARGET_FPU', 'soft', 'null', '.*-linux', d)}" 72COMPATIBLE_HOST:powerpc = "${@bb.utils.contains('TARGET_FPU', 'soft', 'null', '.*-linux', d)}"
73 73
74# X32 isn't supported by valgrind at this time 74# X32 isn't supported by valgrind at this time
75COMPATIBLE_HOST_linux-gnux32 = 'null' 75COMPATIBLE_HOST:linux-gnux32 = 'null'
76COMPATIBLE_HOST_linux-muslx32 = 'null' 76COMPATIBLE_HOST:linux-muslx32 = 'null'
77 77
78# Disable for some MIPS variants 78# Disable for some MIPS variants
79COMPATIBLE_HOST_mipsarchr6 = 'null' 79COMPATIBLE_HOST:mipsarchr6 = 'null'
80COMPATIBLE_HOST_linux-gnun32 = 'null' 80COMPATIBLE_HOST:linux-gnun32 = 'null'
81 81
82# Disable for powerpc64 with musl 82# Disable for powerpc64 with musl
83COMPATIBLE_HOST_libc-musl_powerpc64 = 'null' 83COMPATIBLE_HOST:libc-musl:powerpc64 = 'null'
84 84
85# brokenseip is unfortunately required by ptests to pass 85# brokenseip is unfortunately required by ptests to pass
86inherit autotools-brokensep ptest multilib_header 86inherit autotools-brokensep ptest multilib_header
@@ -89,7 +89,7 @@ EXTRA_OECONF = "--enable-tls --without-mpicc"
89EXTRA_OECONF += "${@['--enable-only32bit','--enable-only64bit'][d.getVar('SITEINFO_BITS') != '32']}" 89EXTRA_OECONF += "${@['--enable-only32bit','--enable-only64bit'][d.getVar('SITEINFO_BITS') != '32']}"
90 90
91# valgrind checks host_cpu "armv7*)", so we need to over-ride the autotools.bbclass default --host option 91# valgrind checks host_cpu "armv7*)", so we need to over-ride the autotools.bbclass default --host option
92EXTRA_OECONF_append_arm = " --host=armv7${HOST_VENDOR}-${HOST_OS}" 92EXTRA_OECONF:append:arm = " --host=armv7${HOST_VENDOR}-${HOST_OS}"
93 93
94EXTRA_OEMAKE = "-w" 94EXTRA_OEMAKE = "-w"
95 95
@@ -101,49 +101,49 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'"
101# which fixes build path issue in DWARF. 101# which fixes build path issue in DWARF.
102SELECTED_OPTIMIZATION = "${DEBUG_FLAGS}" 102SELECTED_OPTIMIZATION = "${DEBUG_FLAGS}"
103 103
104do_configure_prepend () { 104do_configure:prepend () {
105 rm -rf ${S}/config.h 105 rm -rf ${S}/config.h
106 sed -i -e 's:$(abs_top_builddir):$(pkglibdir)/ptest:g' ${S}/none/tests/Makefile.am 106 sed -i -e 's:$(abs_top_builddir):$(pkglibdir)/ptest:g' ${S}/none/tests/Makefile.am
107 sed -i -e 's:$(top_builddir):$(pkglibdir)/ptest:g' ${S}/memcheck/tests/Makefile.am 107 sed -i -e 's:$(top_builddir):$(pkglibdir)/ptest:g' ${S}/memcheck/tests/Makefile.am
108} 108}
109 109
110do_install_append () { 110do_install:append () {
111 install -m 644 ${B}/default.supp ${D}/${libexecdir}/valgrind/ 111 install -m 644 ${B}/default.supp ${D}/${libexecdir}/valgrind/
112 oe_multilib_header valgrind/config.h 112 oe_multilib_header valgrind/config.h
113} 113}
114 114
115VALGRINDARCH ?= "${TARGET_ARCH}" 115VALGRINDARCH ?= "${TARGET_ARCH}"
116VALGRINDARCH_aarch64 = "arm64" 116VALGRINDARCH:aarch64 = "arm64"
117VALGRINDARCH_x86-64 = "amd64" 117VALGRINDARCH:x86-64 = "amd64"
118VALGRINDARCH_x86 = "x86" 118VALGRINDARCH:x86 = "x86"
119VALGRINDARCH_mips = "mips32" 119VALGRINDARCH:mips = "mips32"
120VALGRINDARCH_mipsel = "mips32" 120VALGRINDARCH:mipsel = "mips32"
121VALGRINDARCH_mips64el = "mips64" 121VALGRINDARCH:mips64el = "mips64"
122VALGRINDARCH_powerpc = "ppc" 122VALGRINDARCH:powerpc = "ppc"
123VALGRINDARCH_powerpc64 = "ppc64" 123VALGRINDARCH:powerpc64 = "ppc64"
124VALGRINDARCH_powerpc64le = "ppc64le" 124VALGRINDARCH:powerpc64le = "ppc64le"
125 125
126INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libexecdir}/valgrind/vgpreload_memcheck-${VALGRINDARCH}-linux.so" 126INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libexecdir}/valgrind/vgpreload_memcheck-${VALGRINDARCH}-linux.so"
127 127
128RDEPENDS_${PN} += "perl" 128RDEPENDS:${PN} += "perl"
129 129
130# valgrind needs debug information for ld.so at runtime in order to 130# valgrind needs debug information for ld.so at runtime in order to
131# redirect functions like strlen. 131# redirect functions like strlen.
132RRECOMMENDS_${PN} += "${TCLIBC}-dbg" 132RRECOMMENDS:${PN} += "${TCLIBC}-dbg"
133 133
134RDEPENDS_${PN}-ptest += " bash coreutils curl file \ 134RDEPENDS:${PN}-ptest += " bash coreutils curl file \
135 gdb libgomp \ 135 gdb libgomp \
136 perl \ 136 perl \
137 perl-module-file-basename perl-module-file-glob perl-module-getopt-long \ 137 perl-module-file-basename perl-module-file-glob perl-module-getopt-long \
138 perl-module-overloading perl-module-cwd perl-module-ipc-open3 \ 138 perl-module-overloading perl-module-cwd perl-module-ipc-open3 \
139 perl-module-carp perl-module-symbol \ 139 perl-module-carp perl-module-symbol \
140 procps sed ${PN}-dbg ${PN}-src ${TCLIBC}-src gcc-runtime-dbg" 140 procps sed ${PN}-dbg ${PN}-src ${TCLIBC}-src gcc-runtime-dbg"
141RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils" 141RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-utils"
142 142
143# One of the tests contains a bogus interpreter path on purpose. 143# One of the tests contains a bogus interpreter path on purpose.
144# Skip file dependency check 144# Skip file dependency check
145SKIP_FILEDEPS_${PN}-ptest = '1' 145SKIP_FILEDEPS:${PN}-ptest = '1'
146INSANE_SKIP_${PN}-ptest = "debug-deps" 146INSANE_SKIP:${PN}-ptest = "debug-deps"
147 147
148do_compile_ptest() { 148do_compile_ptest() {
149 oe_runmake check 149 oe_runmake check