diff --git a/package/gumbo-parser/0001-configure.ac-fix-build-without-C.patch b/package/gumbo-parser/0001-configure.ac-fix-build-without-C.patch index cf90e6f3b1..011b929a48 100644 --- a/package/gumbo-parser/0001-configure.ac-fix-build-without-C.patch +++ b/package/gumbo-parser/0001-configure.ac-fix-build-without-C.patch @@ -1,30 +1,49 @@ -From 968975107af5f4382e3e9410a635e32c14cea75f Mon Sep 17 00:00:00 2001 +From e6d9556775b0b8f597ce48dc18c908b3cc09e2a3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 21 Jul 2021 23:47:26 +0200 Subject: [PATCH] configure.ac: fix build without C++ +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Fix the following build failure raised on toolchains without C++: -checking whether the C++ compiler works... no -configure: error: in `/home/buildroot/autobuild/run/instance-0/output-1/build/gumbo-parser-0.10.1': -configure: error: C++ compiler cannot create executables + CXX examples/find_links.o +/bin/bash: line 1: no: command not found + CXX examples/clean_text.o +/bin/bash: line 1: no: command not found +make[2]: *** [Makefile:1071: examples/find_links.o] Error 127 + CXX examples/positions_of_class.o +make[2]: *** Waiting for unfinished jobs.... + CC examples/get_title.o +/bin/bash: line 1: no: command not found +make[2]: *** [Makefile:1071: examples/clean_text.o] Error 127 +make[2]: *** [Makefile:1071: examples/positions_of_class.o] Error 127 + CXX examples/serialize.o +/bin/bash: line 1: no: command not found + CXX examples/prettyprint.o +make[2]: *** [Makefile:1071: examples/serialize.o] Error 127 +/bin/bash: line 1: no: command not found +make[2]: *** [Makefile:1071: examples/prettyprint.o] Error 127 Fixes: - http://autobuild.buildroot.org/results/a32b5d3b959433fd5c3543661c37f80d27fbd010 Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/google/gumbo-parser/pull/426] +[Raphaël: refresh patch on top of 0.13.1, update description] +Signed-off-by: Raphaël Mélotte +[Upstream status: https://codeberg.org/gumbo-parser/gumbo-parser/pulls/28] --- Makefile.am | 2 ++ - configure.ac | 6 +++++- - 2 files changed, 7 insertions(+), 1 deletion(-) + configure.ac | 4 ++++ + 2 files changed, 6 insertions(+) diff --git a/Makefile.am b/Makefile.am -index cb62459..5bebd92 100644 +index e3f9ed7..8a93854 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -105,7 +105,9 @@ gumbo_test_DEPENDENCIES += check-local - gumbo_test_LDADD += gtest/lib/libgtest.la gtest/lib/libgtest_main.la +@@ -96,7 +96,9 @@ gumbo_test_DEPENDENCIES += gtest/lib/libgtest.a gtest/lib/libgtest_main.a + gumbo_test_LDADD += gtest/lib/libgtest.a gtest/lib/libgtest_main.a endif +if HAVE_EXAMPLES @@ -34,20 +53,10 @@ index cb62459..5bebd92 100644 AM_CPPFLAGS = -I"$(srcdir)/src" diff --git a/configure.ac b/configure.ac -index 32dc9b9..172a36b 100644 +index 5636a20..6d21b95 100644 --- a/configure.ac +++ b/configure.ac -@@ -9,8 +9,8 @@ AC_CONFIG_SRCDIR([src/parser.c]) - AC_CONFIG_FILES([Makefile gumbo.pc]) - - # Checks for programs. --AC_PROG_CXX - AC_PROG_CC_C99 -+AC_PROG_CXX - - # Checks for libraries. - -@@ -27,6 +27,10 @@ AC_CHECK_LIB([gtest_main], +@@ -28,6 +28,10 @@ AC_CHECK_LIB([gtest_main], AM_CONDITIONAL(HAVE_SHARED_LIBGTEST, [true]), AM_CONDITIONAL(HAVE_SHARED_LIBGTEST, [false])) @@ -59,5 +68,5 @@ index 32dc9b9..172a36b 100644 AM_INIT_AUTOMAKE([foreign subdir-objects]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -- -2.30.2 +2.49.0 diff --git a/package/gumbo-parser/gumbo-parser.hash b/package/gumbo-parser/gumbo-parser.hash index ee41f167a7..88c8fffa21 100644 --- a/package/gumbo-parser/gumbo-parser.hash +++ b/package/gumbo-parser/gumbo-parser.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 d4fd158d998ab8302fa23bb01119b434bbfaf7139b59f9c74530a703176cb213 v0.10.1.tar.gz +sha256 1a054d1e53d556641a6666537247411a77b0c18ef6ad5df23e30d2131676ef81 0.13.1.tar.gz # Hash for license files: -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 COPYING +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 doc/COPYING diff --git a/package/gumbo-parser/gumbo-parser.mk b/package/gumbo-parser/gumbo-parser.mk index 76fcc876c5..dacd7c981e 100644 --- a/package/gumbo-parser/gumbo-parser.mk +++ b/package/gumbo-parser/gumbo-parser.mk @@ -4,11 +4,11 @@ # ################################################################################ -GUMBO_PARSER_VERSION = 0.10.1 +GUMBO_PARSER_VERSION = 0.13.1 GUMBO_PARSER_SITE = https://codeberg.org/gumbo-parser/gumbo-parser/archive -GUMBO_PARSER_SOURCE = v$(GUMBO_PARSER_VERSION).tar.gz +GUMBO_PARSER_SOURCE = $(GUMBO_PARSER_VERSION).tar.gz GUMBO_PARSER_LICENSE = Apache-2.0 -GUMBO_PARSER_LICENSE_FILES = COPYING +GUMBO_PARSER_LICENSE_FILES = doc/COPYING GUMBO_PARSER_INSTALL_STAGING = YES GUMBO_PARSER_AUTORECONF = YES GUMBO_PARSER_CONF_OPTS = --disable-examples