[Libreoffice-commits] core.git: external/gpgmepp

[Thorsten Behrens (via logerrit)]

 external/gpgmepp/ExternalProject_gpgmepp.mk |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 05d914f01f6b908a2eb02bb9dbbdf662879e2cdd
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Mon Jun 15 00:13:54 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Mon Jun 15 11:26:38 2020 +0200

    gpg4libre: fix build for CentOS baseline
    
    - tests don't work against old baseline libassuan, lets
      disable also for Linux
    - remove no-longer-existing --disable-glibtest option
    
    Change-Id: Iee4d72944d23e63fa8e75f7391effb9fbcbe4845
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96305
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk b/external/gpgmepp/ExternalProject_gpgmepp.mk
index 989844465f1f..c2263413ee18 100644
--- a/external/gpgmepp/ExternalProject_gpgmepp.mk
+++ b/external/gpgmepp/ExternalProject_gpgmepp.mk
@@ -34,7 +34,6 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build): $(call gb_Executable_
 		   --disable-gpg-test \
 		   --disable-gpgsm-test \
 		   --disable-g13-test \
-		   --disable-glibtest \
 		   CFLAGS='$(CFLAGS) \
 				$(if $(ENABLE_OPTIMIZED), \
 					$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
@@ -51,7 +50,10 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build):
 	$(call gb_ExternalProject_run,build,\
 		autoreconf \
 		&& ./configure \
+		   --disable-gpgconf-test \
 		   --disable-gpg-test \
+		   --disable-gpgsm-test \
+		   --disable-g13-test \
 		   --enable-languages="cpp" \
 		   GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \
 		   GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \