From 9e6743e01467ffb08d62b7415fa7af79c09939e0 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 14 Feb 2016 14:33:23 +0000 Subject: gdb: Rationalise PACKAGECONFIG Having two separate PACKAGECONFIG defaults and settings in two separate files is confusing. Move all to the common inc file. Signed-off-by: Richard Purdie --- meta/recipes-devtools/gdb/gdb-common.inc | 2 ++ meta/recipes-devtools/gdb/gdb_7.10.1.bb | 4 ---- 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 \ PACKAGECONFIG ??= "readline" # Use --without-system-readline to compile with readline 5. PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline" +PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python,python python-codecs" +PACKAGECONFIG[babeltrace] = "--with-babeltrace,--without-babeltrace,babeltrace" GDBPROPREFIX = "--program-prefix=''" 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 inherit python-dir -PACKAGECONFIG ??= "" -PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python,python python-codecs" -PACKAGECONFIG[babeltrace] = "--with-babeltrace,--without-babeltrace,babeltrace" - do_configure_prepend() { if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then cat > ${WORKDIR}/python << EOF -- cgit v1.2.3