summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/gdb/gdb-common.inc2
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross-canadian.inc12
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross.inc4
-rw-r--r--meta/recipes-devtools/gdb/gdb_7.11.bb6
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 \
61PACKAGECONFIG ??= "readline" 61PACKAGECONFIG ??= "readline"
62# Use --without-system-readline to compile with readline 5. 62# Use --without-system-readline to compile with readline 5.
63PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline" 63PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline"
64PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python,python python-codecs" 64PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python3,python3 python3-codecs"
65PACKAGECONFIG[babeltrace] = "--with-babeltrace,--without-babeltrace,babeltrace" 65PACKAGECONFIG[babeltrace] = "--with-babeltrace,--without-babeltrace,babeltrace"
66 66
67GDBPROPREFIX = "--program-prefix=''" 67GDBPROPREFIX = "--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 @@
1inherit cross-canadian 1inherit cross-canadian
2inherit python-dir 2inherit python3-dir
3 3
4SUMMARY = "GNU debugger (cross-canadian gdb for ${TARGET_ARCH} target)" 4SUMMARY = "GNU debugger (cross-canadian gdb for ${TARGET_ARCH} target)"
5PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" 5PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}"
@@ -12,9 +12,9 @@ GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
12 12
13# Overrides PACKAGECONFIG variables in gdb-common.inc 13# Overrides PACKAGECONFIG variables in gdb-common.inc
14PACKAGECONFIG ??= "python readline" 14PACKAGECONFIG ??= "python readline"
15PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,nativesdk-python, \ 15PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,nativesdk-python3, \
16 nativesdk-python-core nativesdk-python-lang nativesdk-python-re \ 16 nativesdk-python3-core nativesdk-python3-lang nativesdk-python3-re \
17 nativesdk-python-codecs nativesdk-python-netclient" 17 nativesdk-python3-codecs nativesdk-python3-netclient"
18PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,nativesdk-readline" 18PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,nativesdk-readline"
19 19
20SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb" 20SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb"
@@ -23,8 +23,8 @@ do_configure_prepend() {
23cat > ${WORKDIR}/python << EOF 23cat > ${WORKDIR}/python << EOF
24#! /bin/sh 24#! /bin/sh
25case "\$2" in 25case "\$2" in
26 --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}/" ;; 26 --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}/" ;;
27 --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;; 27 --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" ;;
28 --exec-prefix) echo "${exec_prefix}" ;; 28 --exec-prefix) echo "${exec_prefix}" ;;
29 *) exit 1 ;; 29 *) exit 1 ;;
30esac 30esac
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
2 2
3DEPENDS = "expat-native ncurses-native" 3DEPENDS = "expat-native ncurses-native"
4 4
5inherit pythonnative 5inherit python3native
6 6
7# Overrides PACKAGECONFIG variables in gdb-common.inc 7# Overrides PACKAGECONFIG variables in gdb-common.inc
8PACKAGECONFIG ??= "python readline" 8PACKAGECONFIG ??= "python readline"
9PACKAGECONFIG[python] = "--with-python=${STAGING_BINDIR_NATIVE}/python-native/python,--without-python,python-native" 9PACKAGECONFIG[python] = "--with-python=${STAGING_BINDIR_NATIVE}/python-native/python,--without-python,python3-native"
10PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline-native" 10PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline-native"
11 11
12do_compile_prepend() { 12do_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 @@
1require gdb.inc 1require gdb.inc
2require gdb-${PV}.inc 2require gdb-${PV}.inc
3 3
4inherit python-dir 4inherit python3-dir
5 5
6do_configure_prepend() { 6do_configure_prepend() {
7 if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then 7 if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then
8 cat > ${WORKDIR}/python << EOF 8 cat > ${WORKDIR}/python << EOF
9#!/bin/sh 9#!/bin/sh
10case "\$2" in 10case "\$2" in
11 --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}/" ;; 11 --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}/" ;;
12 --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;; 12 --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" ;;
13 --exec-prefix) echo "${exec_prefix}" ;; 13 --exec-prefix) echo "${exec_prefix}" ;;
14 *) exit 1 ;; 14 *) exit 1 ;;
15esac 15esac