From 916489246b0840463957b85bdd1b2c3fccbfda89 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Mon, 28 Apr 2014 14:15:50 +0300 Subject: gdb: upgrade to 7.7 Removed the following patch(es): * gdb-fix-cygwin-check-in-configure-script.patch (changes included in release) Signed-off-by: Laurentiu Palcu Signed-off-by: Saul Wold --- meta/recipes-devtools/gdb/gdb-7.6.2.inc | 12 ------- meta/recipes-devtools/gdb/gdb-7.7.inc | 10 ++++++ .../gdb/gdb-cross-canadian_7.6.2.bb | 3 -- .../recipes-devtools/gdb/gdb-cross-canadian_7.7.bb | 3 ++ meta/recipes-devtools/gdb/gdb-cross_7.6.2.bb | 4 --- meta/recipes-devtools/gdb/gdb-cross_7.7.bb | 4 +++ .../gdb-fix-cygwin-check-in-configure-script.patch | 38 ---------------------- meta/recipes-devtools/gdb/gdb_7.6.2.bb | 23 ------------- meta/recipes-devtools/gdb/gdb_7.7.bb | 23 +++++++++++++ 9 files changed, 40 insertions(+), 80 deletions(-) delete mode 100644 meta/recipes-devtools/gdb/gdb-7.6.2.inc create mode 100644 meta/recipes-devtools/gdb/gdb-7.7.inc delete mode 100644 meta/recipes-devtools/gdb/gdb-cross-canadian_7.6.2.bb create mode 100644 meta/recipes-devtools/gdb/gdb-cross-canadian_7.7.bb delete mode 100644 meta/recipes-devtools/gdb/gdb-cross_7.6.2.bb create mode 100644 meta/recipes-devtools/gdb/gdb-cross_7.7.bb delete mode 100644 meta/recipes-devtools/gdb/gdb/gdb-fix-cygwin-check-in-configure-script.patch delete mode 100644 meta/recipes-devtools/gdb/gdb_7.6.2.bb create mode 100644 meta/recipes-devtools/gdb/gdb_7.7.bb (limited to 'meta/recipes-devtools/gdb') diff --git a/meta/recipes-devtools/gdb/gdb-7.6.2.inc b/meta/recipes-devtools/gdb/gdb-7.6.2.inc deleted file mode 100644 index ea69b397f5..0000000000 --- a/meta/recipes-devtools/gdb/gdb-7.6.2.inc +++ /dev/null @@ -1,12 +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 += " file://gdb-fix-cygwin-check-in-configure-script.patch " - -S = "${WORKDIR}/${BPN}-${PV}" - -SRC_URI[md5sum] = "9ebf09fa76e4ca6034157086e9b20348" -SRC_URI[sha256sum] = "17f7bcda1b24336aadcb1c5e703c355551e59467e221c6f4353b720dffad73a7" diff --git a/meta/recipes-devtools/gdb/gdb-7.7.inc b/meta/recipes-devtools/gdb/gdb-7.7.inc new file mode 100644 index 0000000000..62adcaa830 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-7.7.inc @@ -0,0 +1,10 @@ +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" + +S = "${WORKDIR}/${BPN}-${PV}" + +SRC_URI[md5sum] = "40051ff95b39bd57b14b1809e2c16152" +SRC_URI[sha256sum] = "8814d98c2733639cb602b6ecd8d69e02498017e02b5724c9451c285b0e9ee173" diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.6.2.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.6.2.bb deleted file mode 100644 index 301035940c..0000000000 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.6.2.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_7.7.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.7.bb new file mode 100644 index 0000000000..301035940c --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.7.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_7.6.2.bb b/meta/recipes-devtools/gdb/gdb-cross_7.6.2.bb deleted file mode 100644 index f9da486d7d..0000000000 --- a/meta/recipes-devtools/gdb/gdb-cross_7.6.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -require gdb-cross.inc -require gdb-${PV}.inc - -SRC_URI += "file://sim-install-6.6.patch" diff --git a/meta/recipes-devtools/gdb/gdb-cross_7.7.bb b/meta/recipes-devtools/gdb/gdb-cross_7.7.bb new file mode 100644 index 0000000000..f9da486d7d --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-cross_7.7.bb @@ -0,0 +1,4 @@ +require gdb-cross.inc +require gdb-${PV}.inc + +SRC_URI += "file://sim-install-6.6.patch" diff --git a/meta/recipes-devtools/gdb/gdb/gdb-fix-cygwin-check-in-configure-script.patch b/meta/recipes-devtools/gdb/gdb/gdb-fix-cygwin-check-in-configure-script.patch deleted file mode 100644 index 4e4647b0d9..0000000000 --- a/meta/recipes-devtools/gdb/gdb/gdb-fix-cygwin-check-in-configure-script.patch +++ /dev/null @@ -1,38 +0,0 @@ -Avoid false positives if the search pattern "lose" is found in path -descriptions in comments generated by the preprocessor. - -See . ---- - gdb/configure | 2 +- - gdb/configure.ac | 2 +- - 3 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/gdb/configure b/gdb/configure -index 5514b2f..b38e183 100755 ---- a/gdb/configure -+++ b/gdb/configure -@@ -12446,7 +12446,7 @@ lose - #endif - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "lose" >/dev/null 2>&1; then : -+ $EGREP "^lose$" >/dev/null 2>&1; then : - gdb_cv_os_cygwin=yes - else - gdb_cv_os_cygwin=no -diff --git a/gdb/configure.ac b/gdb/configure.ac -index 9b73887..2947293 100644 ---- a/gdb/configure.ac -+++ b/gdb/configure.ac -@@ -1877,7 +1877,7 @@ AC_SUBST(WERROR_CFLAGS) - - # In the Cygwin environment, we need some additional flags. - AC_CACHE_CHECK([for cygwin], gdb_cv_os_cygwin, --[AC_EGREP_CPP(lose, [ -+[AC_EGREP_CPP(^lose$, [ - #if defined (__CYGWIN__) || defined (__CYGWIN32__) - lose - #endif],[gdb_cv_os_cygwin=yes],[gdb_cv_os_cygwin=no])]) --- -1.8.4 - diff --git a/meta/recipes-devtools/gdb/gdb_7.6.2.bb b/meta/recipes-devtools/gdb/gdb_7.6.2.bb deleted file mode 100644 index c7ca26b9c1..0000000000 --- a/meta/recipes-devtools/gdb/gdb_7.6.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -require gdb.inc -require gdb-${PV}.inc - -inherit python-dir - -PACKAGECONFIG ??= "" -PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python" - -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}" ;; - --exec-prefix) echo "${exec_prefix}" ;; - *) exit 1 ;; -esac -exit 0 -EOF - chmod +x ${WORKDIR}/python - fi -} diff --git a/meta/recipes-devtools/gdb/gdb_7.7.bb b/meta/recipes-devtools/gdb/gdb_7.7.bb new file mode 100644 index 0000000000..c7ca26b9c1 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb_7.7.bb @@ -0,0 +1,23 @@ +require gdb.inc +require gdb-${PV}.inc + +inherit python-dir + +PACKAGECONFIG ??= "" +PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python" + +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}" ;; + --exec-prefix) echo "${exec_prefix}" ;; + *) exit 1 ;; +esac +exit 0 +EOF + chmod +x ${WORKDIR}/python + fi +} -- cgit 1.2.3-korg