diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2019-05-16 13:55:02 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2019-05-16 16:04:17 +0200 |
commit | daacd89b7513e533e1890526eabdf10c01576596 (patch) | |
tree | 51de3578e7f1bfcd844697509c0021b74884e917 /external/libodfgen/UnpackedTarball_libodfgen.mk | |
parent | f9905401d8cf2d73576231ebd84cfa5f4f73bcac (diff) |
external/libodfgen: Honor -std=... passed in via CXXFLAGS
...which fixes an issue encountered when compiling with Clang against trunk
libstdc++ (which contains pre-C++17-only code that triggers
<https://bugs.llvm.org/show_bug.cgi?id=41896> "Bogus 'error: no return statement
in constexpr function' when void return type is 'templated'")
Change-Id: I33368996c8ac8cf32893ba1b631ace2a606dafb1
Reviewed-on: https://gerrit.libreoffice.org/72409
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/libodfgen/UnpackedTarball_libodfgen.mk')
-rw-r--r-- | external/libodfgen/UnpackedTarball_libodfgen.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk index 80ccbf73bfd5..ee4ed647cb9a 100644 --- a/external/libodfgen/UnpackedTarball_libodfgen.mk +++ b/external/libodfgen/UnpackedTarball_libodfgen.mk @@ -35,8 +35,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \ endif endif +# * external/libodfgen/c++11.patch: obsoleted upstream by +# <https://sourceforge.net/p/libwpd/libodfgen/ci/e11112e50562de4f3252227bfba175ededf82194/> +# "boost::shared_ptr -> std::shared_ptr" $(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \ external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1 \ + external/libodfgen/c++11.patch \ )) # vim: set noet sw=4 ts=4: |