diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-03-08 17:09:37 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-03-08 19:44:22 +0100 |
| commit | 598cf9f76176c6bef00402755d0e941a036c6a2d (patch) | |
| tree | 14e71d59b9542733d731786871efe014e16293e0 | |
| parent | a8ca72cbcd2c6ea0baa5e3569224c2f08d358f3e (diff) | |
Improve gpgmepp -> libassuan/libgpg-error lib dependencies
...so that other executables than svidl would benefit, too
Change-Id: I208ebbc04189c2f25eace19ef0875349cf63d3f0
Reviewed-on: https://gerrit.libreoffice.org/50963
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | RepositoryExternal.mk | 11 | ||||
| -rw-r--r-- | external/gpgmepp/ExternalPackage_gpgmepp.mk | 6 |
2 files changed, 6 insertions, 11 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 0fa3524a582a..aecbd71b8b43 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3927,17 +3927,6 @@ $(call gb_Executable_add_runtime_dependencies,saxparser,\ ) endef -# Executable_svidl links against Library_tl, which links against Library_comphelper, which links -# against libraries from ExternalProject_gpgmepp, which links against libraries from -# ExternalProject_libassuan and ExternalProject_libgpg-error: -define gb_Executable__register_svidl -$(call gb_Executable_add_runtime_dependencies,svidl, \ - $(call gb_Helper_optional,GPGMEPP, \ - $(call gb_Helper_optional,LIBASSUAN,$(call gb_Package_get_target_for_build,libassuan)) \ - $(call gb_Helper_optional,LIBGPGERROR,$(call gb_Package_get_target_for_build,libgpg-error))) \ -) -endef - # NOTE: the dependencies on ure/services.rdb and udkapi.rdb are implicitly # required due to the settings for URE_SERVICES and URE_TYPES in # cppuhelper/source/unorc diff --git a/external/gpgmepp/ExternalPackage_gpgmepp.mk b/external/gpgmepp/ExternalPackage_gpgmepp.mk index 3e841b5d98df..67c3dc64ffd3 100644 --- a/external/gpgmepp/ExternalPackage_gpgmepp.mk +++ b/external/gpgmepp/ExternalPackage_gpgmepp.mk @@ -29,6 +29,12 @@ $(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/gpgme-w32sp endif +# If a tool executed during the build (like svidl) requires these gpgmepp libraries, it will also +# require those libassuan and libgpg-error libraries that these gpgmepp libraries link against: +$(call gb_Package_get_target_for_build,gpgmepp): \ + $(call gb_Helper_optional,LIBASSUAN,$(call gb_Package_get_target_for_build,libassuan)) \ + $(call gb_Helper_optional,LIBGPGERROR,$(call gb_Package_get_target_for_build,libgpg-error)) + endif # $(DISABLE_DYNLOADING) # vim: set noet sw=4 ts=4: |