diff options
| author |   Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-06-02 12:25:54 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-02 11:45:25 +0100 |
| commit | 675d11c73dc1f420c471af01a520f6a20d8a7337 (patch) | |
| tree | ca209f56bf112971b27b25551dde75a462081e21 /meta/recipes-devtools/gdb | |
| parent | c4829e96272376c61d8645df75c4b946f37b461c (diff) | |
| download | openembedded-core-675d11c73dc1f420c471af01a520f6a20d8a7337.tar.gz | |
gdb: move to Python 3
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gdb')
| -rw-r--r-- | meta/recipes-devtools/gdb/gdb-common.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 12 | ||||
| -rw-r--r-- | meta/recipes-devtools/gdb/gdb-cross.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-devtools/gdb/gdb_7.11.bb | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc index 3e00a2e9ff..a5a9adfa7c 100644 --- a/meta/recipes-devtools/gdb/gdb-common.inc +++ b/meta/recipes-devtools/gdb/gdb-common.inc @@ -61,7 +61,7 @@ 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[python] = "--with-python=${WORKDIR}/python,--without-python,python3,python3 python3-codecs" PACKAGECONFIG[babeltrace] = "--with-babeltrace,--without-babeltrace,babeltrace" GDBPROPREFIX = "--program-prefix=''" diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc index 6e42af1bab..e53081d0c0 100644 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc @@ -1,5 +1,5 @@ inherit cross-canadian -inherit python-dir +inherit python3-dir SUMMARY = "GNU debugger (cross-canadian gdb for ${TARGET_ARCH} target)" PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" @@ -12,9 +12,9 @@ GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" # 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[python] = "--with-python=${WORKDIR}/python,--without-python,nativesdk-python3, \ + nativesdk-python3-core nativesdk-python3-lang nativesdk-python3-re \ + nativesdk-python3-codecs nativesdk-python3-netclient" PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,nativesdk-readline" SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb" @@ -23,8 +23,8 @@ do_configure_prepend() { cat > ${WORKDIR}/python << EOF #! /bin/sh case "\$2" in - --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}/" ;; - --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;; + --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}${PYTHON_ABI}" ;; --exec-prefix) echo "${exec_prefix}" ;; *) exit 1 ;; esac diff --git a/meta/recipes-devtools/gdb/gdb-cross.inc b/meta/recipes-devtools/gdb/gdb-cross.inc index c62715f883..7579205dcf 100644 --- a/meta/recipes-devtools/gdb/gdb-cross.inc +++ b/meta/recipes-devtools/gdb/gdb-cross.inc @@ -2,11 +2,11 @@ require gdb-common.inc DEPENDS = "expat-native ncurses-native" -inherit pythonnative +inherit python3native # Overrides PACKAGECONFIG variables in gdb-common.inc 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" do_compile_prepend() { diff --git a/meta/recipes-devtools/gdb/gdb_7.11.bb b/meta/recipes-devtools/gdb/gdb_7.11.bb index ccc33b8656..f02e6431dd 100644 --- a/meta/recipes-devtools/gdb/gdb_7.11.bb +++ b/meta/recipes-devtools/gdb/gdb_7.11.bb @@ -1,15 +1,15 @@ require gdb.inc require gdb-${PV}.inc -inherit python-dir +inherit python3-dir do_configure_prepend() { if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then cat > ${WORKDIR}/python << EOF #!/bin/sh case "\$2" in - --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}/" ;; - --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;; + --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}${PYTHON_ABI}" ;; --exec-prefix) echo "${exec_prefix}" ;; *) exit 1 ;; esac |