Skip to contentSkip to conversation

gdb-cross-canadian: use PACKAGECONFIG for python and readline

PATCH In review Jonathan Liu 2 participants 3 messages Mar 25, 2016 – Mar 27, 2016

lore
Share & tools
lore

Jonathan Liu

author
#0 lore raw

PATCH 1/1 gdb-cross-canadian: use PACKAGECONFIG for python and readline

Signed-off-by Jonathan Liu <[email protected]>
---
 meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
meta/recipes-devtools/gdb/gdb-cross-canadian.inc +7 -5
index ae97759..6e42af1 100644
@@ -5,15 +5,17 @@ SUMMARY = "GNU debugger (cross-canadian gdb for ${TARGET_ARCH} target)"
 PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}"
 BPN = "gdb"
 
-DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext nativesdk-readline nativesdk-python \
+DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext \
            virtual/${HOST_PREFIX}gcc-crosssdk virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-${HOST_PREFIX}libc-for-gcc"
 
-RDEPENDS_${PN} += "nativesdk-python-core nativesdk-python-lang nativesdk-python-re \
-                   nativesdk-python-codecs nativesdk-python-netclient"
-
 GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
 
-EXTRA_OECONF_append = " --with-python=${WORKDIR}/python"
+# Overrides PACKAGECONFIG variables in gdb-common.inc
+PACKAGECONFIG ??= "python readline"
+PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,nativesdk-python, \
+                         nativesdk-python-core nativesdk-python-lang nativesdk-python-re \
+                         nativesdk-python-codecs nativesdk-python-netclient"
+PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,nativesdk-readline"
 
 SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb"
Signature · 1 line
2.7.4
#1 lore raw
Quoted 36 lines · Jonathan Liu
Signed-off-by Jonathan Liu <[email protected]>
---
 meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
meta/recipes-devtools/gdb/gdb-cross-canadian.inc +0 -0
index ae97759..6e42af1 100644
@@ -5,15 +5,17 @@ SUMMARY = "GNU debugger (cross-canadian gdb for

${TARGET_ARCH} target)"
PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" BPN = "gdb"

-DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext nativesdk-readline nativesdk-python \

+DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext \
            virtual/${HOST_PREFIX}gcc-crosssdk

virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk -${HOST_PREFIX}libc-for-gcc"

-RDEPENDS_${PN} += "nativesdk-python-core nativesdk-python-lang nativesdk-python-re \

meta/recipes-devtools/gdb/gdb-cross-canadian.inc +4 -5
-                   nativesdk-python-codecs nativesdk-python
-netclient"
-
 GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
 
-EXTRA_OECONF_append = " --with-python=${WORKDIR}/python"
+# Overrides PACKAGECONFIG variables in gdb-common.inc
+PACKAGECONFIG ??= "python readline"
+PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without
-python,nativesdk-python, \
+                         nativesdk-python-core nativesdk-python-lang

nativesdk-python-re \

meta/recipes-devtools/gdb/gdb-cross-canadian.inc

Quoted 6 lines
meta/recipes-devtools/gdb/gdb-cross-canadian.inc +2 -2
+                         nativesdk-python-codecs nativesdk-python
-netclient"
+PACKAGECONFIG[readline] = "--with-system-readline,--without-system
-readline,nativesdk-readline"
 
 SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb"

Sadly this breaks multilib tests on the autobuilder:

https://autobuilder.yoctoproject.org/main/builders/nightly-multilib/bui
lds/719/steps/BuildImages/logs/stdio

I'll have to remove this from the queue until we can figure out a fix...

Cheers,

Richard

author
#2 lore raw

Hi Richard,

Quoted 49 lines · Richard Purdie
Quoted 36 lines · Jonathan Liu
Signed-off-by Jonathan Liu <[email protected]>
---
 meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
meta/recipes-devtools/gdb/gdb-cross-canadian.inc +0 -0
index ae97759..6e42af1 100644
@@ -5,15 +5,17 @@ SUMMARY = "GNU debugger (cross-canadian gdb for

${TARGET_ARCH} target)"
PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" BPN = "gdb"

-DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext nativesdk-readline nativesdk-python \

+DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext \
            virtual/${HOST_PREFIX}gcc-crosssdk

virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk -${HOST_PREFIX}libc-for-gcc"

-RDEPENDS_${PN} += "nativesdk-python-core nativesdk-python-lang nativesdk-python-re \

meta/recipes-devtools/gdb/gdb-cross-canadian.inc +4 -5
-                   nativesdk-python-codecs nativesdk-python
-netclient"
-
 GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
 
-EXTRA_OECONF_append = " --with-python=${WORKDIR}/python"
+# Overrides PACKAGECONFIG variables in gdb-common.inc
+PACKAGECONFIG ??= "python readline"
+PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without
-python,nativesdk-python, \
+                         nativesdk-python-core nativesdk-python-lang

nativesdk-python-re \

meta/recipes-devtools/gdb/gdb-cross-canadian.inc

Quoted 6 lines
meta/recipes-devtools/gdb/gdb-cross-canadian.inc +2 -2
+                         nativesdk-python-codecs nativesdk-python
-netclient"
+PACKAGECONFIG[readline] = "--with-system-readline,--without-system
-readline,nativesdk-readline"
 
 SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb"

Sadly this breaks multilib tests on the autobuilder:

https://autobuilder.yoctoproject.org/main/builders/nightly-multilib/bui
lds/719/steps/BuildImages/logs/stdio

Quoted 6 lines

I'll have to remove this from the queue until we can figure out a fix...

Cheers,

Richard

I have posted another patchset which takes a different approach and disables the conflicting PACKAGECONFIG variables.

Regards,
Jonathan