summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gdb
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/gdb
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/gdb')
-rw-r--r--meta/recipes-devtools/gdb/gdb-common.inc18
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross-canadian.inc4
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross.inc2
-rw-r--r--meta/recipes-devtools/gdb/gdb.inc4
-rw-r--r--meta/recipes-devtools/gdb/gdb_10.2.bb4
5 files changed, 16 insertions, 16 deletions
diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc
index a2a6364daf..01cca123f8 100644
--- a/meta/recipes-devtools/gdb/gdb-common.inc
+++ b/meta/recipes-devtools/gdb/gdb-common.inc
@@ -5,10 +5,10 @@ SECTION = "devel"
5DEPENDS = "expat zlib ncurses virtual/libiconv ${LTTNGUST} bison-native" 5DEPENDS = "expat zlib ncurses virtual/libiconv ${LTTNGUST} bison-native"
6 6
7LTTNGUST = "lttng-ust" 7LTTNGUST = "lttng-ust"
8LTTNGUST_arc = "" 8LTTNGUST:arc = ""
9LTTNGUST_aarch64 = "" 9LTTNGUST:aarch64 = ""
10LTTNGUST_mipsarch = "" 10LTTNGUST:mipsarch = ""
11LTTNGUST_sh4 = "" 11LTTNGUST:sh4 = ""
12 12
13inherit autotools texinfo 13inherit autotools texinfo
14 14
@@ -52,14 +52,14 @@ do_configure () {
52 52
53# we don't want gdb to provide bfd/iberty/opcodes, which instead will override the 53# we don't want gdb to provide bfd/iberty/opcodes, which instead will override the
54# right bits installed by binutils. Same for bfd.info -- also from binutils. 54# right bits installed by binutils. Same for bfd.info -- also from binutils.
55do_install_append() { 55do_install:append() {
56 rm -rf ${D}${libdir} 56 rm -rf ${D}${libdir}
57 rm -rf ${D}${includedir} 57 rm -rf ${D}${includedir}
58 rm -rf ${D}${datadir}/locale 58 rm -rf ${D}${datadir}/locale
59 rm -f ${D}${infodir}/bfd.info 59 rm -f ${D}${infodir}/bfd.info
60} 60}
61 61
62RRECOMMENDS_gdb_append_linux = " glibc-thread-db " 62RRECOMMENDS:gdb:append_linux = " glibc-thread-db "
63RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db " 63RRECOMMENDS:gdb:append_linux-gnueabi = " glibc-thread-db "
64RRECOMMENDS_gdbserver_append_linux = " glibc-thread-db " 64RRECOMMENDS:gdbserver:append_linux = " glibc-thread-db "
65RRECOMMENDS_gdbserver_append_linux-gnueabi = " glibc-thread-db " 65RRECOMMENDS:gdbserver:append_linux-gnueabi = " glibc-thread-db "
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
index edb05b6f18..670534fb5f 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
@@ -21,7 +21,7 @@ PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, nativesdk-
21 21
22SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb" 22SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb"
23 23
24do_configure_prepend() { 24do_configure:prepend() {
25cat > ${WORKDIR}/python << EOF 25cat > ${WORKDIR}/python << EOF
26#! /bin/sh 26#! /bin/sh
27case "\$2" in 27case "\$2" in
@@ -37,7 +37,7 @@ EOF
37 37
38# we don't want gdb to provide bfd/iberty/opcodes, which instead will override the 38# we don't want gdb to provide bfd/iberty/opcodes, which instead will override the
39# right bits installed by binutils. 39# right bits installed by binutils.
40do_install_append() { 40do_install:append() {
41 rm -rf ${D}${exec_prefix}/lib 41 rm -rf ${D}${exec_prefix}/lib
42 cross_canadian_bindirlinks 42 cross_canadian_bindirlinks
43} 43}
diff --git a/meta/recipes-devtools/gdb/gdb-cross.inc b/meta/recipes-devtools/gdb/gdb-cross.inc
index f8a113da8f..6ba3eae6fc 100644
--- a/meta/recipes-devtools/gdb/gdb-cross.inc
+++ b/meta/recipes-devtools/gdb/gdb-cross.inc
@@ -10,7 +10,7 @@ PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3-native
10PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline-native" 10PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline-native"
11PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, elfutils-native" 11PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, elfutils-native"
12 12
13do_compile_prepend() { 13do_compile:prepend() {
14 export STAGING_LIBDIR="${STAGING_LIBDIR_NATIVE}" 14 export STAGING_LIBDIR="${STAGING_LIBDIR_NATIVE}"
15 export STAGING_INCDIR="${STAGING_INCDIR_NATIVE}" 15 export STAGING_INCDIR="${STAGING_INCDIR_NATIVE}"
16} 16}
diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc
index aa845b5c49..f4cd0a5c01 100644
--- a/meta/recipes-devtools/gdb/gdb.inc
+++ b/meta/recipes-devtools/gdb/gdb.inc
@@ -3,9 +3,9 @@ require gdb-common.inc
3inherit gettext 3inherit gettext
4 4
5#LDFLAGS_append = " -s" 5#LDFLAGS_append = " -s"
6#export CFLAGS_append=" -L${STAGING_LIBDIR}" 6#export CFLAGS:append=" -L${STAGING_LIBDIR}"
7 7
8# cross-canadian must not see this 8# cross-canadian must not see this
9PACKAGES =+ "gdbserver" 9PACKAGES =+ "gdbserver"
10FILES_gdbserver = "${bindir}/gdbserver" 10FILES:gdbserver = "${bindir}/gdbserver"
11 11
diff --git a/meta/recipes-devtools/gdb/gdb_10.2.bb b/meta/recipes-devtools/gdb/gdb_10.2.bb
index d70757a151..e73e3a2c5c 100644
--- a/meta/recipes-devtools/gdb/gdb_10.2.bb
+++ b/meta/recipes-devtools/gdb/gdb_10.2.bb
@@ -3,7 +3,7 @@ require gdb-${PV}.inc
3 3
4inherit python3-dir 4inherit python3-dir
5 5
6EXTRA_OEMAKE_append_libc-musl = "\ 6EXTRA_OEMAKE:append:libc-musl = "\
7 gt_cv_func_gnugettext1_libc=yes \ 7 gt_cv_func_gnugettext1_libc=yes \
8 gt_cv_func_gnugettext2_libc=yes \ 8 gt_cv_func_gnugettext2_libc=yes \
9 gl_cv_func_working_strerror=yes \ 9 gl_cv_func_working_strerror=yes \
@@ -11,7 +11,7 @@ EXTRA_OEMAKE_append_libc-musl = "\
11 gl_cv_func_gettimeofday_clobber=no \ 11 gl_cv_func_gettimeofday_clobber=no \
12 " 12 "
13 13
14do_configure_prepend() { 14do_configure:prepend() {
15 if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then 15 if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then
16 cat > ${WORKDIR}/python << EOF 16 cat > ${WORKDIR}/python << EOF
17#!/bin/sh 17#!/bin/sh