mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

gdb: move to Python 3

Browse Source 
(From OE-Core rev: 675d11c73dc1f420c471af01a520f6a20d8a7337)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2016-06-02 12:25:54 +03:00
committed by Richard Purdie
parent ada03c326b
commit 609bf2ecf5
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/gdb/gdb-common.inc
+1 -1
View File
@@ -61,7 +61,7 @@ EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x --disable-werror \
PACKAGECONFIG ??= "readline" PACKAGECONFIG ??= "readline"
# Use --without-system-readline to compile with readline 5. # Use --without-system-readline to compile with readline 5.
PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline" PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline"
PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python,python python-codecs" PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python3,python3 python3-codecs"
PACKAGECONFIG[babeltrace] = "--with-babeltrace,--without-babeltrace,babeltrace" PACKAGECONFIG[babeltrace] = "--with-babeltrace,--without-babeltrace,babeltrace"
GDBPROPREFIX = "--program-prefix=''" GDBPROPREFIX = "--program-prefix=''"
meta/recipes-devtools/gdb/gdb-cross-canadian.inc
+6 -6
View File
@@ -1,5 +1,5 @@
inherit cross-canadian inherit cross-canadian
inherit python-dir inherit python3-dir
SUMMARY = "GNU debugger (cross-canadian gdb for ${TARGET_ARCH} target)" SUMMARY = "GNU debugger (cross-canadian gdb for ${TARGET_ARCH} target)"
PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}"
@@ -12,9 +12,9 @@ GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
# Overrides PACKAGECONFIG variables in gdb-common.inc # Overrides PACKAGECONFIG variables in gdb-common.inc
PACKAGECONFIG ??= "python readline" PACKAGECONFIG ??= "python readline"
PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,nativesdk-python, \ PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,nativesdk-python3, \
nativesdk-python-core nativesdk-python-lang nativesdk-python-re \ nativesdk-python3-core nativesdk-python3-lang nativesdk-python3-re \
nativesdk-python-codecs nativesdk-python-netclient" nativesdk-python3-codecs nativesdk-python3-netclient"
PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,nativesdk-readline" PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,nativesdk-readline"
SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb" SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb"
@@ -23,8 +23,8 @@ do_configure_prepend() {
cat > ${WORKDIR}/python << EOF cat > ${WORKDIR}/python << EOF
#! /bin/sh #! /bin/sh
case "\$2" in case "\$2" in
--includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}/" ;; --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}/" ;;
--ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;; --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" ;;
--exec-prefix) echo "${exec_prefix}" ;; --exec-prefix) echo "${exec_prefix}" ;;
*) exit 1 ;; *) exit 1 ;;
esac esac
meta/recipes-devtools/gdb/gdb-cross.inc
+2 -2
View File
@@ -2,11 +2,11 @@ require gdb-common.inc
DEPENDS = "expat-native ncurses-native" DEPENDS = "expat-native ncurses-native"
inherit pythonnative inherit python3native
# Overrides PACKAGECONFIG variables in gdb-common.inc # Overrides PACKAGECONFIG variables in gdb-common.inc
PACKAGECONFIG ??= "python readline" PACKAGECONFIG ??= "python readline"
PACKAGECONFIG[python] = "--with-python=${STAGING_BINDIR_NATIVE}/python-native/python,--without-python,python-native" PACKAGECONFIG[python] = "--with-python=${STAGING_BINDIR_NATIVE}/python-native/python,--without-python,python3-native"
PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline-native" PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline-native"
do_compile_prepend() { do_compile_prepend() {
meta/recipes-devtools/gdb/gdb_7.11.bb
+3 -3
View File
@@ -1,15 +1,15 @@
require gdb.inc require gdb.inc
require gdb-${PV}.inc require gdb-${PV}.inc
inherit python-dir inherit python3-dir
do_configure_prepend() { do_configure_prepend() {
if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then
cat > ${WORKDIR}/python << EOF cat > ${WORKDIR}/python << EOF
#!/bin/sh #!/bin/sh
case "\$2" in case "\$2" in
--includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}/" ;; --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}/" ;;
--ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;; --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" ;;
--exec-prefix) echo "${exec_prefix}" ;; --exec-prefix) echo "${exec_prefix}" ;;
*) exit 1 ;; *) exit 1 ;;
esac esac