[PATCH] gdb: Rationalise PACKAGECONFIG

[PATCH] gdb: Rationalise PACKAGECONFIG

[Richard Purdie]

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 <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc
index 06272a9..0d28ee4 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 cd52e27..f897e12 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

Re: [PATCH] gdb: Rationalise PACKAGECONFIG

[Jonathan Liu]

Hi Richard,

On 15 February 2016 at 01:33, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> 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 <richard.purdie@linuxfoundation.org>
>
> diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc
> index 06272a9..0d28ee4 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 cd52e27..f897e12 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
>
>

This change causes Python support to not be enabled properly in
gdb-cross and gdb-cross-canadian as --without-python is now added to
the EXTRA_OECONF after --with-python=...

I have submitted patches to the mailing list to fix this.

Regards,
Jonathan