From 46a98bfa3b06627bd7dce825602c0f681d2e760b Mon Sep 17 00:00:00 2001 From: wangmy Date: Tue, 25 Jan 2022 21:12:47 +0800 Subject: [PATCH] cgdb: upgrade 0.7.1 -> 0.8.0 0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch removed since it is inappropriate in 0.8.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...se-of-mips-which-is-reserved-on-mips.patch | 67 ------------------- .../cgdb/{cgdb_0.7.1.bb => cgdb_0.8.0.bb} | 7 +- 2 files changed, 2 insertions(+), 72 deletions(-) delete mode 100644 meta-oe/recipes-devtools/cgdb/cgdb/0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch rename meta-oe/recipes-devtools/cgdb/{cgdb_0.7.1.bb => cgdb_0.8.0.bb} (68%) diff --git a/meta-oe/recipes-devtools/cgdb/cgdb/0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch b/meta-oe/recipes-devtools/cgdb/cgdb/0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch deleted file mode 100644 index daf90ad44d..0000000000 --- a/meta-oe/recipes-devtools/cgdb/cgdb/0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch +++ /dev/null @@ -1,67 +0,0 @@ -From a3eba0fcee5e96ef47a6d3fac7196a1074f0dc17 Mon Sep 17 00:00:00 2001 -From: Adrian Bunk -Date: Wed, 30 Oct 2019 11:07:23 +0200 -Subject: Avoid use of "mips" which is reserved on mips - -Upstream-Status: Submitted [https://github.com/brasko/gdbwire/pull/9] - -Signed-off-by: Adrian Bunk - -diff --git a/src/gdbwire_mi_parser.c b/src/gdbwire_mi_parser.c -index 3f6b563..24aa0cf 100644 ---- a/lib/tgdb/gdbwire.c -+++ b/lib/tgdb/gdbwire.c -@@ -40,7 +40,7 @@ struct gdbwire_mi_parser { - /* The GDB/MI lexer state */ - yyscan_t mils; - /* The GDB/MI push parser state */ -- gdbwire_mi_pstate *mips; -+ gdbwire_mi_pstate *mipst; - /* The client parser callbacks */ - struct gdbwire_mi_parser_callbacks callbacks; - }; -@@ -71,8 +71,8 @@ gdbwire_mi_parser_create(struct gdbwire_mi_parser_callbacks callbacks) - } - - /* Create a new push parser state instance */ -- parser->mips = gdbwire_mi_pstate_new(); -- if (!parser->mips) { -+ parser->mipst = gdbwire_mi_pstate_new(); -+ if (!parser->mipst) { - gdbwire_mi_lex_destroy(parser->mils); - gdbwire_string_destroy(parser->buffer); - free(parser); -@@ -81,7 +81,7 @@ gdbwire_mi_parser_create(struct gdbwire_mi_parser_callbacks callbacks) - - /* Ensure that the callbacks are non null */ - if (!callbacks.gdbwire_mi_output_callback) { -- gdbwire_mi_pstate_delete(parser->mips); -+ gdbwire_mi_pstate_delete(parser->mipst); - gdbwire_mi_lex_destroy(parser->mils); - gdbwire_string_destroy(parser->buffer); - free(parser); -@@ -109,9 +109,9 @@ void gdbwire_mi_parser_destroy(struct gdbwire_mi_parser *parser) - } - - /* Free the push parser instance */ -- if (parser->mips) { -- gdbwire_mi_pstate_delete(parser->mips); -- parser->mips = NULL; -+ if (parser->mipst) { -+ gdbwire_mi_pstate_delete(parser->mipst); -+ parser->mipst = NULL; - } - - free(parser); -@@ -162,7 +162,7 @@ gdbwire_mi_parser_parse_line(struct gdbwire_mi_parser *parser, - pattern = gdbwire_mi_lex(parser->mils); - if (pattern == 0) - break; -- mi_status = gdbwire_mi_push_parse(parser->mips, pattern, NULL, -+ mi_status = gdbwire_mi_push_parse(parser->mipst, pattern, NULL, - parser->mils, &output); - } while (mi_status == YYPUSH_MORE); - --- -2.20.1 - diff --git a/meta-oe/recipes-devtools/cgdb/cgdb_0.7.1.bb b/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb similarity index 68% rename from meta-oe/recipes-devtools/cgdb/cgdb_0.7.1.bb rename to meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb index a48e32af23..99e09bfc62 100644 --- a/meta-oe/recipes-devtools/cgdb/cgdb_0.7.1.bb +++ b/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb @@ -9,11 +9,8 @@ DEPENDS = "flex-native readline ncurses" inherit autotools texinfo -SRC_URI = "http://cgdb.me/files/${BP}.tar.gz \ - file://0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch \ -" -SRC_URI[md5sum] = "a104862ffd3145b076303992e9a3af26" -SRC_URI[sha256sum] = "bb723be58ec68cb59a598b8e24a31d10ef31e0e9c277a4de07b2f457fe7de198" +SRC_URI = "http://cgdb.me/files/${BP}.tar.gz" +SRC_URI[sha256sum] = "0d38b524d377257b106bad6d856d8ae3304140e1ee24085343e6ddf1b65811f1" CACHED_CONFIGUREVARS = "ac_cv_file__dev_ptmx=yes ac_cv_rl_version=6.2 ac_cv_file__proc_self_status=yes" EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR} \