[Libreoffice-commits] core.git: configure.ac external/gpgme external/libassuan external/libgpg-error RepositoryExternal.mk

[Thorsten Behrens]

 RepositoryExternal.mk                                 |    2 +-
 configure.ac                                          |    2 +-
 external/gpgme/ExternalPackage_gpgme.mk               |    9 +++++++++
 external/libassuan/ExternalPackage_libassuan.mk       |    8 ++++++++
 external/libgpg-error/ExternalPackage_libgpg-error.mk |    9 +++++++++
 5 files changed, 28 insertions(+), 2 deletions(-)

New commits:
commit 16598d526e9cc79698152daa5acc1e2718da933c
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Fri Oct 20 18:06:17 2017 +0200

    gpg4libre: enable OpenPGP support for Mac
    
    Change-Id: Iad7d6b045be90efb32da3ffb1c19753b58b1753d
    Reviewed-on: https://gerrit.libreoffice.org/43616
    Reviewed-by: Siegmund Gorr <siegmund.gorr at cib.de>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f1f39de76f3b..0e90180cb474 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3467,7 +3467,7 @@ $(call gb_LinkTarget_use_package,$(1),gpgme)
 
 endef
 
-ifeq ($(OS),LINUX)
+ifneq ($(filter-out MACOSX LINUX,$(OS)),)
 
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 	gpgme \
diff --git a/configure.ac b/configure.ac
index c6494b870c27..a3cfc9b9a48d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10233,7 +10233,7 @@ fi
 AC_SUBST(ENABLE_PDFIUM)
 
 SYSTEM_GPGMEPP=
-if test "$_os" = "Linux"; then
+if test "$_os" = "Linux" -o "$_os" = "Darwin"; then
     dnl ===================================================================
     dnl Check for system gpgme
     dnl ===================================================================
diff --git a/external/gpgme/ExternalPackage_gpgme.mk b/external/gpgme/ExternalPackage_gpgme.mk
index 4148f3598f24..a09726e82bc8 100644
--- a/external/gpgme/ExternalPackage_gpgme.mk
+++ b/external/gpgme/ExternalPackage_gpgme.mk
@@ -13,9 +13,18 @@ $(eval $(call gb_ExternalPackage_use_external_project,gpgme,gpgme))
 
 ifneq ($(DISABLE_DYNLOADING),TRUE)
 
+ifeq ($(OS),LINUX)
+
 $(eval $(call gb_ExternalPackage_add_file,gpgme,$(LIBO_LIB_FOLDER)/libgpgmepp.so.6,lang/cpp/src/.libs/libgpgmepp.so.6.4.0))
 $(eval $(call gb_ExternalPackage_add_file,gpgme,$(LIBO_LIB_FOLDER)/libgpgme.so.11,src/.libs/libgpgme.so.11.18.0))
 
+else
+
+$(eval $(call gb_ExternalPackage_add_file,gpgme,$(LIBO_LIB_FOLDER)/libgpgmepp.6.dylib,lang/cpp/src/.libs/libgpgmepp.6.dylib))
+$(eval $(call gb_ExternalPackage_add_file,gpgme,$(LIBO_LIB_FOLDER)/libgpgme.11.dylib,src/.libs/libgpgme.11.dylib))
+
+endif
+
 endif # $(DISABLE_DYNLOADING)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libassuan/ExternalPackage_libassuan.mk b/external/libassuan/ExternalPackage_libassuan.mk
index 490869a531b3..837e0ce49f56 100644
--- a/external/libassuan/ExternalPackage_libassuan.mk
+++ b/external/libassuan/ExternalPackage_libassuan.mk
@@ -13,8 +13,16 @@ $(eval $(call gb_ExternalPackage_use_external_project,libassuan,libassuan))
 
 ifneq ($(DISABLE_DYNLOADING),TRUE)
 
+ifeq ($(OS),LINUX)
+
 $(eval $(call gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.7.3))
 
+else
+
+$(eval $(call gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.0.dylib,src/.libs/libassuan.0.dylib))
+
+endif
+
 endif # $(DISABLE_DYNLOADING)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk b/external/libgpg-error/ExternalPackage_libgpg-error.mk
index f23c8998819d..e5e60685ac3f 100644
--- a/external/libgpg-error/ExternalPackage_libgpg-error.mk
+++ b/external/libgpg-error/ExternalPackage_libgpg-error.mk
@@ -13,8 +13,17 @@ $(eval $(call gb_ExternalPackage_use_external_project,libgpg-error,libgpg-error)
 
 ifneq ($(DISABLE_DYNLOADING),TRUE)
 
+ifeq ($(OS),LINUX)
+
 $(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error.so.0,src/.libs/libgpg-error.so.0.22.0))
 
+else
+
+$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error.0.dylib,src/.libs/libgpg-error.0.dylib))
+
+
+endif
+
 endif # $(DISABLE_DYNLOADING)
 
 # vim: set noet sw=4 ts=4: