diff options
| author | David Tardon <dtardon@redhat.com> | 2017-09-13 12:42:02 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2017-09-14 18:48:10 +0200 |
| commit | 196e1e6d8b9864a47ee02049c075c52027288ff3 (patch) | |
| tree | e96e416e7dbdb46d15ba622f095c1c80b0b1b44a /external/libwpd/ExternalProject_libwpd.mk | |
| parent | 0b1c92bde2be59dffdfd801b2dbb8d9a68f68526 (diff) | |
upload libwpd 0.10.2
Change-Id: I7ee8557f5e8d4c66f0b839bfe5f4affb16095daa
Reviewed-on: https://gerrit.libreoffice.org/42235
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/libwpd/ExternalProject_libwpd.mk')
| -rw-r--r-- | external/libwpd/ExternalProject_libwpd.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/external/libwpd/ExternalProject_libwpd.mk b/external/libwpd/ExternalProject_libwpd.mk index f1b7cdf18cb1..d7eea6dc4355 100644 --- a/external/libwpd/ExternalProject_libwpd.mk +++ b/external/libwpd/ExternalProject_libwpd.mk @@ -16,6 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,libwpd,\ )) $(eval $(call gb_ExternalProject_use_externals,libwpd,\ + boost_headers \ revenge \ )) @@ -30,11 +31,12 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) : --without-docs \ --disable-tools \ --disable-debug \ + --disable-werror \ $(if $(filter MACOSX,$(OS)), \ - --disable-werror \ --prefix=/@.__________________________________________________OOO) \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))") \ + CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ $(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \ 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \ |