0001-configure.ac-fix-build-without-C.patch 2.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263
  1. From 968975107af5f4382e3e9410a635e32c14cea75f Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Wed, 21 Jul 2021 23:47:26 +0200
  4. Subject: [PATCH] configure.ac: fix build without C++
  5. Fix the following build failure raised on toolchains without C++:
  6. checking whether the C++ compiler works... no
  7. configure: error: in `/home/buildroot/autobuild/run/instance-0/output-1/build/gumbo-parser-0.10.1':
  8. configure: error: C++ compiler cannot create executables
  9. Fixes:
  10. - http://autobuild.buildroot.org/results/a32b5d3b959433fd5c3543661c37f80d27fbd010
  11. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  12. [Upstream status: https://github.com/google/gumbo-parser/pull/426]
  13. ---
  14. Makefile.am | 2 ++
  15. configure.ac | 6 +++++-
  16. 2 files changed, 7 insertions(+), 1 deletion(-)
  17. diff --git a/Makefile.am b/Makefile.am
  18. index cb62459..5bebd92 100644
  19. --- a/Makefile.am
  20. +++ b/Makefile.am
  21. @@ -105,7 +105,9 @@ gumbo_test_DEPENDENCIES += check-local
  22. gumbo_test_LDADD += gtest/lib/libgtest.la gtest/lib/libgtest_main.la
  23. endif
  24. +if HAVE_EXAMPLES
  25. noinst_PROGRAMS = clean_text find_links get_title positions_of_class benchmark serialize prettyprint
  26. +endif
  27. LDADD = libgumbo.la
  28. AM_CPPFLAGS = -I"$(srcdir)/src"
  29. diff --git a/configure.ac b/configure.ac
  30. index 32dc9b9..172a36b 100644
  31. --- a/configure.ac
  32. +++ b/configure.ac
  33. @@ -9,8 +9,8 @@ AC_CONFIG_SRCDIR([src/parser.c])
  34. AC_CONFIG_FILES([Makefile gumbo.pc])
  35. # Checks for programs.
  36. -AC_PROG_CXX
  37. AC_PROG_CC_C99
  38. +AC_PROG_CXX
  39. # Checks for libraries.
  40. @@ -27,6 +27,10 @@ AC_CHECK_LIB([gtest_main],
  41. AM_CONDITIONAL(HAVE_SHARED_LIBGTEST, [true]),
  42. AM_CONDITIONAL(HAVE_SHARED_LIBGTEST, [false]))
  43. +AC_ARG_ENABLE([examples],
  44. + AS_HELP_STRING([--disable-examples], [Disable examples]))
  45. +AM_CONDITIONAL([HAVE_EXAMPLES], [test "x$enable_examples" != "xno"])
  46. +
  47. # Init Automake & libtool
  48. AM_INIT_AUTOMAKE([foreign subdir-objects])
  49. m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
  50. --
  51. 2.30.2