diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-05-03 16:54:11 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-05-04 13:09:46 +0200 |
| commit | d59760428669a3e6b90524b9bc52829ece539c80 (patch) | |
| tree | 684221019c76e16f1cce0c3e7c07d62c95f44c18 /external | |
| parent | 277062b509b2709ce5f4f9a8f67dddd713a3b7d0 (diff) | |
Allow actually passing CXXFLAGS into external/libnumbertext
...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 <nemeth@numbertext.org>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libnumbertext/UnpackedTarball_libnumbertext.mk | 6 | ||||
| -rw-r--r-- | external/libnumbertext/configure.patch | 10 |
2 files changed, 16 insertions, 0 deletions
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]) + |