From c7b600e2f47288f1a995b372706519f5897e78c3 Mon Sep 17 00:00:00 2001
From: Martin Borg <martin.borg@enea.com>
Date: Fri, 29 Jan 2016 14:21:47 +0100
Subject: gdb: upgrade gdb to version 7.10.1

Upgrade gdb so changes apply to the version used on poky master branch.

The patch to avoid ksh dependency was removed since the patched file
has been removed from gdb.

Signed-off-by: Martin Borg <martin.borg@enea.com>
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
---
 .../change-scripts-support-from-ksh-to-bash.patch  | 14 --------
 recipes-devtools/gdb/gdb_7.10.1.bbappend           | 39 +++++++++++++++++++++
 recipes-devtools/gdb/gdb_7.7.1.bbappend            | 40 ----------------------
 3 files changed, 39 insertions(+), 54 deletions(-)
 delete mode 100644 recipes-devtools/gdb/gdb/change-scripts-support-from-ksh-to-bash.patch
 create mode 100644 recipes-devtools/gdb/gdb_7.10.1.bbappend
 delete mode 100644 recipes-devtools/gdb/gdb_7.7.1.bbappend

(limited to 'recipes-devtools')

diff --git a/recipes-devtools/gdb/gdb/change-scripts-support-from-ksh-to-bash.patch b/recipes-devtools/gdb/gdb/change-scripts-support-from-ksh-to-bash.patch
deleted file mode 100644
index d98affc..0000000
--- a/recipes-devtools/gdb/gdb/change-scripts-support-from-ksh-to-bash.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Avoid ksh dependency
-
-Upstream-Status: Pending
-
-Signed-off-by: Paul Vaduva <paul.vaduva@enea.com>
-diff -Naur a/gdb/testsuite/gdb.hp/tools/odump b/gdb/testsuite/gdb.hp/tools/odump
---- a/gdb/testsuite/gdb.hp/tools/odump	2015-05-25 10:13:31.956107840 +0200
-+++ b/gdb/testsuite/gdb.hp/tools/odump	2015-05-25 10:14:04.690707176 +0200
-@@ -1,4 +1,4 @@
--#!/bin/ksh
-+#!/bin/bash
-
- # First source /app/appserver
- . /app/appserver
diff --git a/recipes-devtools/gdb/gdb_7.10.1.bbappend b/recipes-devtools/gdb/gdb_7.10.1.bbappend
new file mode 100644
index 0000000..89404b1
--- /dev/null
+++ b/recipes-devtools/gdb/gdb_7.10.1.bbappend
@@ -0,0 +1,39 @@
+inherit ptest
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://run-ptest \
+            file://runtest-flags.patch \
+            file://0001-add-delay-before-run-exp-file.patch \
+            file://0002-function-name-is-used-by-mistake.patch \
+            file://gdb-ptest-attach.patch \
+           "
+
+
+
+DEPENDS_${PN}-ptest += "expect dejagnu tcl"
+RDEPENDS_${PN}-ptest += "glibc-charmap-ibm1047 \
+                         glibc-gconv-ibm1047 \
+                         glibc-charmap-ebcdic-us \
+                         glibc-gconv-ebcdic-us \
+                         glibc-gconv-utf-32 \
+                         glibc-gconv-utf-16 \
+                         prelink \
+                         expect \
+                         dejagnu \
+                         make \
+                         bash \
+                        "
+do_configure_ptest () {
+    cd ${S}/gdb/testsuite/
+    ./configure --host=${HOST_SYS} --build=${BUILD_SYS}
+    make site.exp
+}
+
+do_install_ptest () {
+    cp -pr ${S}/gdb/testsuite/ ${D}${PTEST_PATH}
+    cp -pr ${S}/gdb/features/  ${D}${PTEST_PATH}
+    install -p  ${S}/config.sub     ${D}${PTEST_PATH}/testsuite/
+    install -p  ${S}/config.guess   ${D}${PTEST_PATH}/testsuite/
+    install -p  ${S}/install-sh     ${D}${PTEST_PATH}/testsuite/
+}
diff --git a/recipes-devtools/gdb/gdb_7.7.1.bbappend b/recipes-devtools/gdb/gdb_7.7.1.bbappend
deleted file mode 100644
index 2da31a0..0000000
--- a/recipes-devtools/gdb/gdb_7.7.1.bbappend
+++ /dev/null
@@ -1,40 +0,0 @@
-inherit ptest
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://run-ptest \
-            file://runtest-flags.patch \
-            file://0001-add-delay-before-run-exp-file.patch \
-            file://0002-function-name-is-used-by-mistake.patch \
-            file://gdb-ptest-attach.patch \
-            file://change-scripts-support-from-ksh-to-bash.patch \
-           "
-
-
-
-DEPENDS_${PN}-ptest += "expect dejagnu tcl"
-RDEPENDS_${PN}-ptest += "glibc-charmap-ibm1047 \
-                         glibc-gconv-ibm1047 \
-                         glibc-charmap-ebcdic-us \
-                         glibc-gconv-ebcdic-us \
-                         glibc-gconv-utf-32 \
-                         glibc-gconv-utf-16 \
-                         prelink \
-                         expect \
-                         dejagnu \
-                         make \
-                         bash \
-                        "
-do_configure_ptest () {
-    cd ${S}/gdb/testsuite/
-    ./configure --host=${HOST_SYS} --build=${BUILD_SYS}
-    make site.exp
-}
-
-do_install_ptest () {
-    cp -pr ${S}/gdb/testsuite/ ${D}${PTEST_PATH}
-    cp -pr ${S}/gdb/features/  ${D}${PTEST_PATH}
-    install -p  ${S}/config.sub     ${D}${PTEST_PATH}/testsuite/
-    install -p  ${S}/config.guess   ${D}${PTEST_PATH}/testsuite/
-    install -p  ${S}/install-sh     ${D}${PTEST_PATH}/testsuite/
-}
-- 
cgit v1.2.3-54-g00ecf