RepositoryExternal.mk | 2 +-
xmlsecurity/Executable_pdfverify.mk | 12 ------------
2 files changed, 1 insertion(+), 13 deletions(-)
New commits:
commit ee9cb85e9adc03693141a106630a4f278b4e93ac
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Mar 10 17:11:49 2017 +0100
gpgme: change gb_LinkTarget__use_gpgmepp to depend on package
This replaces f764d67da42caa71fd5e02146b1ca32680ae2f6e with a better
fix, no point in littering the makefiles with manual dependencies when
we can just avoid the problem in one place with a tiny performance cost.
Change-Id: Ic7e91ee4c99deb12a9544cf691c0995de6ae2bad
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 00cae64..284fe0a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3427,7 +3427,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$(call gb_LinkTarget_add_libs,$(1),\
-L$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src/.libs/
-lgpgmepp \
)
-$(call gb_LinkTarget_use_external_project,$(1),gpgme,full)
+$(call gb_LinkTarget_use_package,$(1),gpgme)
endef
diff --git a/xmlsecurity/Executable_pdfverify.mk
b/xmlsecurity/Executable_pdfverify.mk
index 9364e39..9a67a78 100644
--- a/xmlsecurity/Executable_pdfverify.mk
+++ b/xmlsecurity/Executable_pdfverify.mk
@@ -34,16 +34,4 @@ $(eval $(call gb_Executable_add_exception_objects,pdfverify,\
xmlsecurity/workben/pdfverify \
))
-# Library_xmlsecurity links against Library_xsec_gpg (on certain OS), which
-# links against gpgmepp dynamic library from external project gpgmepp, which
-# (for non-SYSTEM_GPGMEPP) is delivered to instdir/program in
-# ExternalPackage_gpgme, and at least the Linux linker wants to see all
-# (recursively) linked libraries when linking an executable:
-ifneq ($(filter-out WNT MACOSX ANDROID IOS,$(OS)),)
-ifneq ($(SYSTEM_GPGMEPP),TRUE)
-$(call gb_Executable_get_target,pdfverify): \
- $(call gb_ExternalPackage_get_target,gpgme)
-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
