From 4dfba049f42a23dbd910e01bc279f1c9d38e2d2c Mon Sep 17 00:00:00 2001 From: wangmy Date: Wed, 28 Apr 2021 16:59:29 +0800 Subject: gdb: upgrade 10.1 -> 10.2 (From OE-Core rev: 7505165ac90ba34a465eb707c7e6c8ccbeae024d) Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-devtools/gdb/gdb-10.1.inc | 19 --------------- meta/recipes-devtools/gdb/gdb-10.2.inc | 19 +++++++++++++++ .../gdb/gdb-cross-canadian_10.1.bb | 3 --- .../gdb/gdb-cross-canadian_10.2.bb | 3 +++ meta/recipes-devtools/gdb/gdb-cross_10.1.bb | 2 -- meta/recipes-devtools/gdb/gdb-cross_10.2.bb | 2 ++ meta/recipes-devtools/gdb/gdb_10.1.bb | 28 ---------------------- meta/recipes-devtools/gdb/gdb_10.2.bb | 28 ++++++++++++++++++++++ 8 files changed, 52 insertions(+), 52 deletions(-) delete mode 100644 meta/recipes-devtools/gdb/gdb-10.1.inc create mode 100644 meta/recipes-devtools/gdb/gdb-10.2.inc delete mode 100644 meta/recipes-devtools/gdb/gdb-cross-canadian_10.1.bb create mode 100644 meta/recipes-devtools/gdb/gdb-cross-canadian_10.2.bb delete mode 100644 meta/recipes-devtools/gdb/gdb-cross_10.1.bb create mode 100644 meta/recipes-devtools/gdb/gdb-cross_10.2.bb delete mode 100644 meta/recipes-devtools/gdb/gdb_10.1.bb create mode 100644 meta/recipes-devtools/gdb/gdb_10.2.bb (limited to 'meta/recipes-devtools/gdb') diff --git a/meta/recipes-devtools/gdb/gdb-10.1.inc b/meta/recipes-devtools/gdb/gdb-10.1.inc deleted file mode 100644 index 07de17f84f..0000000000 --- a/meta/recipes-devtools/gdb/gdb-10.1.inc +++ /dev/null @@ -1,19 +0,0 @@ -LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" - -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ - file://0001-make-man-install-relative-to-DESTDIR.patch \ - file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ - file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ - file://0004-Add-support-for-Renesas-SH-sh4-architecture.patch \ - file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \ - file://0006-use-asm-sgidefs.h.patch \ - file://0008-Change-order-of-CFLAGS.patch \ - file://0009-resolve-restrict-keyword-conflict.patch \ - file://0010-Fix-invalid-sigprocmask-call.patch \ - file://0011-gdbserver-ctrl-c-handling.patch \ - " -SRC_URI[sha256sum] = "f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0" diff --git a/meta/recipes-devtools/gdb/gdb-10.2.inc b/meta/recipes-devtools/gdb/gdb-10.2.inc new file mode 100644 index 0000000000..0a7df54e9f --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-10.2.inc @@ -0,0 +1,19 @@ +LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" + +SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ + file://0001-make-man-install-relative-to-DESTDIR.patch \ + file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ + file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ + file://0004-Add-support-for-Renesas-SH-sh4-architecture.patch \ + file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \ + file://0006-use-asm-sgidefs.h.patch \ + file://0008-Change-order-of-CFLAGS.patch \ + file://0009-resolve-restrict-keyword-conflict.patch \ + file://0010-Fix-invalid-sigprocmask-call.patch \ + file://0011-gdbserver-ctrl-c-handling.patch \ + " +SRC_URI[sha256sum] = "aaa1223d534c9b700a8bec952d9748ee1977513f178727e1bee520ee000b4f29" diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_10.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_10.1.bb deleted file mode 100644 index 301035940c..0000000000 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian_10.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -require gdb-common.inc -require gdb-cross-canadian.inc -require gdb-${PV}.inc diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_10.2.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_10.2.bb new file mode 100644 index 0000000000..301035940c --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_10.2.bb @@ -0,0 +1,3 @@ +require gdb-common.inc +require gdb-cross-canadian.inc +require gdb-${PV}.inc diff --git a/meta/recipes-devtools/gdb/gdb-cross_10.1.bb b/meta/recipes-devtools/gdb/gdb-cross_10.1.bb deleted file mode 100644 index 50cf159fdb..0000000000 --- a/meta/recipes-devtools/gdb/gdb-cross_10.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require gdb-cross.inc -require gdb-${PV}.inc diff --git a/meta/recipes-devtools/gdb/gdb-cross_10.2.bb b/meta/recipes-devtools/gdb/gdb-cross_10.2.bb new file mode 100644 index 0000000000..50cf159fdb --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-cross_10.2.bb @@ -0,0 +1,2 @@ +require gdb-cross.inc +require gdb-${PV}.inc diff --git a/meta/recipes-devtools/gdb/gdb_10.1.bb b/meta/recipes-devtools/gdb/gdb_10.1.bb deleted file mode 100644 index d70757a151..0000000000 --- a/meta/recipes-devtools/gdb/gdb_10.1.bb +++ /dev/null @@ -1,28 +0,0 @@ -require gdb.inc -require gdb-${PV}.inc - -inherit python3-dir - -EXTRA_OEMAKE_append_libc-musl = "\ - gt_cv_func_gnugettext1_libc=yes \ - gt_cv_func_gnugettext2_libc=yes \ - gl_cv_func_working_strerror=yes \ - gl_cv_func_strerror_0_works=yes \ - gl_cv_func_gettimeofday_clobber=no \ - " - -do_configure_prepend() { - if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then - cat > ${WORKDIR}/python << EOF -#!/bin/sh -case "\$2" in - --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 -exit 0 -EOF - chmod +x ${WORKDIR}/python - fi -} diff --git a/meta/recipes-devtools/gdb/gdb_10.2.bb b/meta/recipes-devtools/gdb/gdb_10.2.bb new file mode 100644 index 0000000000..d70757a151 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb_10.2.bb @@ -0,0 +1,28 @@ +require gdb.inc +require gdb-${PV}.inc + +inherit python3-dir + +EXTRA_OEMAKE_append_libc-musl = "\ + gt_cv_func_gnugettext1_libc=yes \ + gt_cv_func_gnugettext2_libc=yes \ + gl_cv_func_working_strerror=yes \ + gl_cv_func_strerror_0_works=yes \ + gl_cv_func_gettimeofday_clobber=no \ + " + +do_configure_prepend() { + if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then + cat > ${WORKDIR}/python << EOF +#!/bin/sh +case "\$2" in + --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 +exit 0 +EOF + chmod +x ${WORKDIR}/python + fi +} -- cgit v1.2.3-54-g00ecf