diff options
| -rw-r--r-- | RepositoryExternal.mk | 2 | ||||
| -rw-r--r-- | xmlsecurity/Executable_pdfverify.mk | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 00cae6405e5f..284fe0a6906e 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 9364e390ea76..9a67a785983a 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: |