writerperfect/Library_wpftwriter.mk | 11 +++++++++++
1 file changed, 11 insertions(+)
New commits:
commit f470e5b7812cc4a1afdef5033a25b682cb1d2b94
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Oct 2 08:42:07 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Oct 2 11:25:35 2019 +0200
On Windows, Library_wpftwriter indirectly references Bcrypt.lib
No idea why this only started to show now in my clang-cl build, but this is
similar to what 23a8d5ffbbe58761b89f590f0735abccd69a3681 "Upgrade
external/boost
to Boost 1.69.0" did at ucb/Library_ucpcmis1.mk:
workdir/UnpackedTarball/libepubgen/src/lib/EPUBGenerator.cpp includes
boost/uuid/uuid_generators.hpp, includes boost/uuid/random_generator.hpp,
includes boost/uuid/detail/random_provider.hpp, includes
boost/uuid/detail/random_provider_include_platform.hpp, includes
boost/uuid/detail/random_provider_bcrypt.ipp, includes
boost/winapi/bcrypt.hpp,
includes system bcrypt.h.
Change-Id: I1dcfb9a13515d3e6f0a249c4a42ae5ebbf11fcf4
Reviewed-on: https://gerrit.libreoffice.org/80004
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/writerperfect/Library_wpftwriter.mk
b/writerperfect/Library_wpftwriter.mk
index 2ac6bd141cf2..0ea6756e15a4 100644
--- a/writerperfect/Library_wpftwriter.mk
+++ b/writerperfect/Library_wpftwriter.mk
@@ -97,4 +97,15 @@ $(eval $(call gb_Library_add_exception_objects,wpftwriter,\
writerperfect/source/writer/exp/xmltext \
))
+# On Windows, libepubgen-0.1.lib(EPUBGenerator.obj) references
BCryptCloseAlgorithmProvider,
+# BCryptGenRandom, and BCryptOpenAlgorithmProvider via
+# workdir/UnpackedTarball/boost/boost/winapi/bcrypt.hpp:
+ifeq ($(OS),WNT)
+ifeq ($(SYSTEM_EPUBGEN)$(SYSTEM_BOOST),)
+$(eval $(call gb_Library_add_libs,wpftwriter, \
+ Bcrypt.lib \
+))
+endif
+endif
+
# vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
