From d59760428669a3e6b90524b9bc52829ece539c80 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 3 May 2018 16:54:11 +0200 Subject: Allow actually passing CXXFLAGS into external/libnumbertext MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ...as external/libnumbertext/ExternalProject_libnumbertext.mk tried to do Change-Id: I8c0deeaa1db31fc0ab5042c7f8a1ced0d65e29ee Reviewed-on: https://gerrit.libreoffice.org/53806 Reviewed-by: László Németh Tested-by: Jenkins --- external/libnumbertext/UnpackedTarball_libnumbertext.mk | 6 ++++++ external/libnumbertext/configure.patch | 10 ++++++++++ 2 files changed, 16 insertions(+) create mode 100644 external/libnumbertext/configure.patch (limited to 'external') diff --git a/external/libnumbertext/UnpackedTarball_libnumbertext.mk b/external/libnumbertext/UnpackedTarball_libnumbertext.mk index ac2a14133205..f5c1607562e3 100644 --- a/external/libnumbertext/UnpackedTarball_libnumbertext.mk +++ b/external/libnumbertext/UnpackedTarball_libnumbertext.mk @@ -13,4 +13,10 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libnumbertext,$(LIBNUMBERTEXT_TARBA $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libnumbertext)) +$(eval $(call gb_UnpackedTarball_set_patchlevel,libnumbertext,0)) + +$(eval $(call gb_UnpackedTarball_add_patches,libnumbertext, \ + external/libnumbertext/configure.patch \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/libnumbertext/configure.patch b/external/libnumbertext/configure.patch new file mode 100644 index 000000000000..f31ab31cdc57 --- /dev/null +++ b/external/libnumbertext/configure.patch @@ -0,0 +1,10 @@ +--- configure.ac ++++ configure.ac +@@ -22,7 +22,6 @@ + + dnl Checks for typedefs, structures, and compiler characteristics. + AC_LANG([C++]) +-CXXFLAGS='-Wall -std=c++11' + + AC_CHECK_HEADERS([codecvt regex]) + -- cgit v1.2.3