diff options
| author | David Tardon <dtardon@redhat.com> | 2018-01-02 13:56:54 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2018-01-05 19:47:10 +0100 |
| commit | 86994e1c25bb5a2d0f97d17328457fa6dfd2f288 (patch) | |
| tree | 251c9ce8805a1b3aeead5a9fbcf6436749af56e4 /external/libebook/ExternalProject_libebook.mk | |
| parent | ofz#4971 Bad-cast (diff) | |
| download | core-86994e1c25bb5a2d0f97d17328457fa6dfd2f288.tar.gz core-86994e1c25bb5a2d0f97d17328457fa6dfd2f288.zip | |
upload libe-book 0.1.3
Change-Id: I8862e7f4d2dcb007295028b9ec7be04e58ebafd3
Reviewed-on: https://gerrit.libreoffice.org/47264
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/libebook/ExternalProject_libebook.mk')
| -rw-r--r-- | external/libebook/ExternalProject_libebook.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk index 476aac285b3a..bac09b699b12 100644 --- a/external/libebook/ExternalProject_libebook.mk +++ b/external/libebook/ExternalProject_libebook.mk @@ -18,12 +18,12 @@ $(eval $(call gb_ExternalProject_register_targets,libebook,\ $(eval $(call gb_ExternalProject_use_externals,libebook,\ boost_headers \ icu \ + liblangtag \ libxml2 \ revenge \ zlib \ )) -# TODO: remove the generators/stream empty vars on libe-book update $(call gb_ExternalProject_get_state_target,libebook,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ @@ -39,11 +39,11 @@ $(call gb_ExternalProject_get_state_target,libebook,build) : --disable-werror \ --disable-weffc \ CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ - CPPFLAGS="$(CPPFLAGS) $(ICU_UCHAR_TYPE) $(BOOST_CPPFLAGS) \ - -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \ + CPPFLAGS="$(CPPFLAGS) $(ICU_UCHAR_TYPE) $(BOOST_CPPFLAGS)" \ + LANGTAG_CFLAGS="$(LIBLANGTAG_CFLAGS)" \ + LANGTAG_LIBS="$(LIBLANGTAG_LIBS)" \ XML_CFLAGS="$(LIBXML_CFLAGS)" \ XML_LIBS="$(LIBXML_LIBS)" \ - REVENGE_GENERATORS_CFLAGS=' ' REVENGE_GENERATORS_LIBS=' ' REVENGE_STREAM_CFLAGS=' ' REVENGE_STREAM_LIBS=' ' \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) |