diff options
| author | Thorsten Behrens <thorsten.behrens@cib.de> | 2017-11-15 21:31:07 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-11-22 17:57:08 +0100 |
| commit | 50a55d862034b7a06510c014332236f44e306831 (patch) | |
| tree | 422addf00716499a75d07cfb69d53aa0e2b0f118 /RepositoryExternal.mk | |
| parent | bafbaa3fed95f28f368b0bd4256dbe2a714e3bd8 (diff) | |
gpg4libre: cleanup gpgme & add gbuild lib for gpgmepp
This moves the external to gpgmepp, since that's what we _actually_
link against; plus tons of enablement for Windows build, mostly
related to linker probs integration.
There's still no good way to build a DLL with autotools, so we fall
back to gbuild manual make, see also tdf#91480
Change-Id: Ifd8217ef58536612d2389d48e343db133a13fb9c
Reviewed-on: https://gerrit.libreoffice.org/44970
Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 67 |
1 files changed, 60 insertions, 7 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index db70ce875e71..995a490214ec 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3472,7 +3472,7 @@ endef else # NON-SYSTEM_GPGME define gb_ExternalProject__use_gpgmepp -$(call gb_ExternalProject_use_external_project,$(1),gpgme) +$(call gb_ExternalProject_use_external_project,$(1),gpgmepp) endef define gb_ExternalProject__use_libassuan @@ -3484,24 +3484,77 @@ $(call gb_ExternalProject_use_external_project,$(1),libgpg-error) endef +ifneq ($(filter WNT,$(OS)),) + +define gb_LinkTarget__use_libgpg-error +$(call gb_LinkTarget_use_package,$(1),libgpg-error) + +$(call gb_LinkTarget_set_include,$(1),\ + $(GPG_ERROR_CFLAGS) \ + $$(INCLUDE) \ +) +$(call gb_LinkTarget_add_libs,$(1),\ + -LIBPATH:$(call gb_UnpackedTarball_get_dir,libgpg-error)/src/.libs libgpg-error.lib \ +) + +endef + +define gb_LinkTarget__use_libassuan +$(call gb_LinkTarget_use_package,$(1),libassuan) + +$(call gb_LinkTarget_set_include,$(1),\ + $(LIBASSUAN_CFLAGS) \ + $$(INCLUDE) \ +) +$(call gb_LinkTarget_add_libs,$(1),\ + -LIBPATH:$(call gb_UnpackedTarball_get_dir,libassuan)/src/.libs libassuan.lib \ +) + +endef + define gb_LinkTarget__use_gpgmepp $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \ - -I$(call gb_UnpackedTarball_get_dir,gpgme)/src \ + -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src \ + -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/src \ $$(GPG_ERROR_CFLAGS) \ $$(INCLUDE) \ ) -$(call gb_LinkTarget_add_libs,$(1),\ - -L$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src/.libs/ -lgpgmepp \ +$(call gb_LinkTarget_use_libraries,$(1),\ + gpgmepp \ ) -$(call gb_LinkTarget_use_package,$(1),gpgme) endef +$(eval $(call gb_Helper_register_packages_for_install,ooo,\ + libassuan \ + libgpg-error \ +)) + +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\ + gpgmepp \ +)) + +endif + ifneq ($(filter MACOSX LINUX,$(OS)),) +define gb_LinkTarget__use_gpgmepp +$(call gb_LinkTarget_use_package,$(1),gpgmepp) + +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src \ + -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/src \ + $$(GPG_ERROR_CFLAGS) \ + $$(INCLUDE) \ +) +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src/.libs/ -lgpgmepp \ +) + +endef + $(eval $(call gb_Helper_register_packages_for_install,ooo,\ - gpgme \ + gpgmepp \ libassuan \ libgpg-error \ )) |