summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-14 14:33:23 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-15 16:28:45 +0000
commit5394ada142688ad7e91417db8fd398394272a6e7 (patch)
tree4462bbbe04263b6103f9f231412658ad8c517d40 /meta
parentce0f8ab3b48cf7dc4904cb986016c11285f49e46 (diff)
downloadpoky-5394ada142688ad7e91417db8fd398394272a6e7.tar.gz
gdb: Rationalise PACKAGECONFIG
Having two separate PACKAGECONFIG defaults and settings in two separate files is confusing. Move all to the common inc file. (From OE-Core rev: 9e6743e01467ffb08d62b7415fa7af79c09939e0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/gdb/gdb-common.inc2
-rw-r--r--meta/recipes-devtools/gdb/gdb_7.10.1.bb4
2 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc
index 06272a99a3..0d28ee4eef 100644
--- a/meta/recipes-devtools/gdb/gdb-common.inc
+++ b/meta/recipes-devtools/gdb/gdb-common.inc
@@ -45,6 +45,8 @@ EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x --disable-werror \
45PACKAGECONFIG ??= "readline" 45PACKAGECONFIG ??= "readline"
46# Use --without-system-readline to compile with readline 5. 46# Use --without-system-readline to compile with readline 5.
47PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline" 47PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline"
48PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python,python python-codecs"
49PACKAGECONFIG[babeltrace] = "--with-babeltrace,--without-babeltrace,babeltrace"
48 50
49GDBPROPREFIX = "--program-prefix=''" 51GDBPROPREFIX = "--program-prefix=''"
50 52
diff --git a/meta/recipes-devtools/gdb/gdb_7.10.1.bb b/meta/recipes-devtools/gdb/gdb_7.10.1.bb
index cd52e27d56..f897e1213e 100644
--- a/meta/recipes-devtools/gdb/gdb_7.10.1.bb
+++ b/meta/recipes-devtools/gdb/gdb_7.10.1.bb
@@ -3,10 +3,6 @@ require gdb-${PV}.inc
3 3
4inherit python-dir 4inherit python-dir
5 5
6PACKAGECONFIG ??= ""
7PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python,python python-codecs"
8PACKAGECONFIG[babeltrace] = "--with-babeltrace,--without-babeltrace,babeltrace"
9
10do_configure_prepend() { 6do_configure_prepend() {
11 if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then 7 if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then
12 cat > ${WORKDIR}/python << EOF 8 cat > ${WORKDIR}/python << EOF