diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-10-30 11:12:57 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-11-01 17:22:52 -0700 |
commit | 840f24a68d1df08ea6ff39e5b2b33fa410cab112 (patch) | |
tree | f2110936390909ab3b64fc722111b99cb27649f5 | |
parent | 301972a0c8f7ec9b843ddb9a48bd87b7e71760b6 (diff) | |
download | meta-openembedded-840f24a68d1df08ea6ff39e5b2b33fa410cab112.tar.gz |
cgdb: Upgrade 0.6.8 -> 0.7.1
Obsolete patch removed.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-devtools/cgdb/cgdb/0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch | 67 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/cgdb/cgdb/remove-help2man.patch | 47 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/cgdb/cgdb_0.7.1.bb (renamed from meta-oe/recipes-devtools/cgdb/cgdb_0.6.8.bb) | 9 |
3 files changed, 72 insertions, 51 deletions
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 new file mode 100644 index 0000000000..daf90ad44d --- /dev/null +++ b/meta-oe/recipes-devtools/cgdb/cgdb/0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch | |||
@@ -0,0 +1,67 @@ | |||
1 | From a3eba0fcee5e96ef47a6d3fac7196a1074f0dc17 Mon Sep 17 00:00:00 2001 | ||
2 | From: Adrian Bunk <bunk@stusta.de> | ||
3 | Date: Wed, 30 Oct 2019 11:07:23 +0200 | ||
4 | Subject: Avoid use of "mips" which is reserved on mips | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/brasko/gdbwire/pull/9] | ||
7 | |||
8 | Signed-off-by: Adrian Bunk <bunk@stusta.de> | ||
9 | |||
10 | diff --git a/src/gdbwire_mi_parser.c b/src/gdbwire_mi_parser.c | ||
11 | index 3f6b563..24aa0cf 100644 | ||
12 | --- a/lib/tgdb/gdbwire.c | ||
13 | +++ b/lib/tgdb/gdbwire.c | ||
14 | @@ -40,7 +40,7 @@ struct gdbwire_mi_parser { | ||
15 | /* The GDB/MI lexer state */ | ||
16 | yyscan_t mils; | ||
17 | /* The GDB/MI push parser state */ | ||
18 | - gdbwire_mi_pstate *mips; | ||
19 | + gdbwire_mi_pstate *mipst; | ||
20 | /* The client parser callbacks */ | ||
21 | struct gdbwire_mi_parser_callbacks callbacks; | ||
22 | }; | ||
23 | @@ -71,8 +71,8 @@ gdbwire_mi_parser_create(struct gdbwire_mi_parser_callbacks callbacks) | ||
24 | } | ||
25 | |||
26 | /* Create a new push parser state instance */ | ||
27 | - parser->mips = gdbwire_mi_pstate_new(); | ||
28 | - if (!parser->mips) { | ||
29 | + parser->mipst = gdbwire_mi_pstate_new(); | ||
30 | + if (!parser->mipst) { | ||
31 | gdbwire_mi_lex_destroy(parser->mils); | ||
32 | gdbwire_string_destroy(parser->buffer); | ||
33 | free(parser); | ||
34 | @@ -81,7 +81,7 @@ gdbwire_mi_parser_create(struct gdbwire_mi_parser_callbacks callbacks) | ||
35 | |||
36 | /* Ensure that the callbacks are non null */ | ||
37 | if (!callbacks.gdbwire_mi_output_callback) { | ||
38 | - gdbwire_mi_pstate_delete(parser->mips); | ||
39 | + gdbwire_mi_pstate_delete(parser->mipst); | ||
40 | gdbwire_mi_lex_destroy(parser->mils); | ||
41 | gdbwire_string_destroy(parser->buffer); | ||
42 | free(parser); | ||
43 | @@ -109,9 +109,9 @@ void gdbwire_mi_parser_destroy(struct gdbwire_mi_parser *parser) | ||
44 | } | ||
45 | |||
46 | /* Free the push parser instance */ | ||
47 | - if (parser->mips) { | ||
48 | - gdbwire_mi_pstate_delete(parser->mips); | ||
49 | - parser->mips = NULL; | ||
50 | + if (parser->mipst) { | ||
51 | + gdbwire_mi_pstate_delete(parser->mipst); | ||
52 | + parser->mipst = NULL; | ||
53 | } | ||
54 | |||
55 | free(parser); | ||
56 | @@ -162,7 +162,7 @@ gdbwire_mi_parser_parse_line(struct gdbwire_mi_parser *parser, | ||
57 | pattern = gdbwire_mi_lex(parser->mils); | ||
58 | if (pattern == 0) | ||
59 | break; | ||
60 | - mi_status = gdbwire_mi_push_parse(parser->mips, pattern, NULL, | ||
61 | + mi_status = gdbwire_mi_push_parse(parser->mipst, pattern, NULL, | ||
62 | parser->mils, &output); | ||
63 | } while (mi_status == YYPUSH_MORE); | ||
64 | |||
65 | -- | ||
66 | 2.20.1 | ||
67 | |||
diff --git a/meta-oe/recipes-devtools/cgdb/cgdb/remove-help2man.patch b/meta-oe/recipes-devtools/cgdb/cgdb/remove-help2man.patch deleted file mode 100644 index 4358629b7b..0000000000 --- a/meta-oe/recipes-devtools/cgdb/cgdb/remove-help2man.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | Disable building manpages so that make install doesn't fail due to lack of help2man | ||
2 | |||
3 | Upstream-Status: Inappropriate [config] | ||
4 | |||
5 | Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com> | ||
6 | --- | ||
7 | configure.ac | 3 --- | ||
8 | doc/Makefile.am | 5 ----- | ||
9 | 2 files changed, 8 deletions(-) | ||
10 | |||
11 | diff --git a/configure.ac b/configure.ac | ||
12 | index ee7eca0..1f0d924 100644 | ||
13 | --- a/configure.ac | ||
14 | +++ b/configure.ac | ||
15 | @@ -134,9 +134,6 @@ dnl check that the required tools are available to generate documentation | ||
16 | if test "$HAS_MAKEINFO" != "yes" ; then | ||
17 | AC_MSG_ERROR([Please install makeinfo before installing]) | ||
18 | fi | ||
19 | -if test "$HAS_HELP2MAN" != "yes" ; then | ||
20 | - AC_MSG_ERROR([Please install help2man]) | ||
21 | -fi | ||
22 | |||
23 | dnl Checking for log10 function in math - I would like to remove this | ||
24 | AC_CHECK_LIB(m, log10) | ||
25 | diff --git a/doc/Makefile.am b/doc/Makefile.am | ||
26 | index 60662f6..0ae0013 100644 | ||
27 | --- a/doc/Makefile.am | ||
28 | +++ b/doc/Makefile.am | ||
29 | @@ -1,15 +1,10 @@ | ||
30 | info_TEXINFOS = cgdb.texi | ||
31 | cgdb_TEXINFOS = gpl.texi | ||
32 | |||
33 | -dist_man_MANS = cgdb.1 | ||
34 | EXTRA_DIST = cgdb.txt | ||
35 | |||
36 | dist_pkgdata_DATA = cgdb.txt | ||
37 | |||
38 | -# generate the man page using help2man. | ||
39 | -cgdb.1: | ||
40 | - help2man --output=$(top_srcdir)/doc/cgdb.1 $(top_builddir)/cgdb/cgdb$(EXEEXT) | ||
41 | - | ||
42 | cgdb.txt: cgdb.texi $(srcdir)/version.texi $(cgdb_TEXINFOS) | ||
43 | TEXTS = cgdb.txt | ||
44 | text-am: $(TEXTS) | ||
45 | -- | ||
46 | 1.9.1 | ||
47 | |||
diff --git a/meta-oe/recipes-devtools/cgdb/cgdb_0.6.8.bb b/meta-oe/recipes-devtools/cgdb/cgdb_0.7.1.bb index 74019fb622..57e364e1ca 100644 --- a/meta-oe/recipes-devtools/cgdb/cgdb_0.6.8.bb +++ b/meta-oe/recipes-devtools/cgdb/cgdb_0.7.1.bb | |||
@@ -10,11 +10,12 @@ DEPENDS = "flex-native readline ncurses" | |||
10 | inherit autotools | 10 | inherit autotools |
11 | 11 | ||
12 | SRC_URI = "http://cgdb.me/files/${BP}.tar.gz \ | 12 | SRC_URI = "http://cgdb.me/files/${BP}.tar.gz \ |
13 | file://remove-help2man.patch" | 13 | file://0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch \ |
14 | SRC_URI[md5sum] = "7bd38c79bf4d794d239928fef401fca3" | 14 | " |
15 | SRC_URI[sha256sum] = "be203e29be295097439ab67efe3dc8261f742c55ff3647718d67d52891f4cf41" | 15 | SRC_URI[md5sum] = "a104862ffd3145b076303992e9a3af26" |
16 | SRC_URI[sha256sum] = "bb723be58ec68cb59a598b8e24a31d10ef31e0e9c277a4de07b2f457fe7de198" | ||
16 | 17 | ||
17 | CACHED_CONFIGUREVARS = "ac_cv_file__dev_ptmx=yes ac_cv_rl_version=6.2" | 18 | CACHED_CONFIGUREVARS = "ac_cv_file__dev_ptmx=yes ac_cv_rl_version=6.2 ac_cv_file__proc_self_status=yes" |
18 | EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR} \ | 19 | EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR} \ |
19 | --with-ncurses=${STAGING_LIBDIR}" | 20 | --with-ncurses=${STAGING_LIBDIR}" |
20 | 21 | ||