diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-devtools/gdb | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-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.inc | 18 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb-cross.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb.inc | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb_10.2.bb | 4 |
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" | |||
5 | DEPENDS = "expat zlib ncurses virtual/libiconv ${LTTNGUST} bison-native" | 5 | DEPENDS = "expat zlib ncurses virtual/libiconv ${LTTNGUST} bison-native" |
6 | 6 | ||
7 | LTTNGUST = "lttng-ust" | 7 | LTTNGUST = "lttng-ust" |
8 | LTTNGUST_arc = "" | 8 | LTTNGUST:arc = "" |
9 | LTTNGUST_aarch64 = "" | 9 | LTTNGUST:aarch64 = "" |
10 | LTTNGUST_mipsarch = "" | 10 | LTTNGUST:mipsarch = "" |
11 | LTTNGUST_sh4 = "" | 11 | LTTNGUST:sh4 = "" |
12 | 12 | ||
13 | inherit autotools texinfo | 13 | inherit 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. |
55 | do_install_append() { | 55 | do_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 | ||
62 | RRECOMMENDS_gdb_append_linux = " glibc-thread-db " | 62 | RRECOMMENDS:gdb:append_linux = " glibc-thread-db " |
63 | RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db " | 63 | RRECOMMENDS:gdb:append_linux-gnueabi = " glibc-thread-db " |
64 | RRECOMMENDS_gdbserver_append_linux = " glibc-thread-db " | 64 | RRECOMMENDS:gdbserver:append_linux = " glibc-thread-db " |
65 | RRECOMMENDS_gdbserver_append_linux-gnueabi = " glibc-thread-db " | 65 | RRECOMMENDS: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 | ||
22 | SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb" | 22 | SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb" |
23 | 23 | ||
24 | do_configure_prepend() { | 24 | do_configure:prepend() { |
25 | cat > ${WORKDIR}/python << EOF | 25 | cat > ${WORKDIR}/python << EOF |
26 | #! /bin/sh | 26 | #! /bin/sh |
27 | case "\$2" in | 27 | case "\$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. |
40 | do_install_append() { | 40 | do_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 | |||
10 | PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline-native" | 10 | PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline-native" |
11 | PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, elfutils-native" | 11 | PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, elfutils-native" |
12 | 12 | ||
13 | do_compile_prepend() { | 13 | do_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 | |||
3 | inherit gettext | 3 | inherit 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 |
9 | PACKAGES =+ "gdbserver" | 9 | PACKAGES =+ "gdbserver" |
10 | FILES_gdbserver = "${bindir}/gdbserver" | 10 | FILES: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 | ||
4 | inherit python3-dir | 4 | inherit python3-dir |
5 | 5 | ||
6 | EXTRA_OEMAKE_append_libc-musl = "\ | 6 | EXTRA_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 | ||
14 | do_configure_prepend() { | 14 | do_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 |