[Libreoffice-commits] core.git: postprocess/Rdb_services.mk

Caolán McNamara caolanm at redhat.com
Mon Mar 6 20:37:47 UTC 2017


 postprocess/Rdb_services.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c8267b8b65a2adcad97ea767669dabbdc4b2b27e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 6 20:35:44 2017 +0000

    oss-fuzz: Module_xmlsecurity has gpg inside ENABLE_NSS
    
    which is probably wrong, but nothing uses --disable-nss except IOS
    and the static build where nss is not built
    
    Change-Id: Icdd24ffc301715a0227e31f67335c8775806e085

diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 2bb1cd7..a8ea37a 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -109,9 +109,9 @@ $(eval $(call gb_Rdb_add_components,services,\
 	xmloff/source/transform/xof \
 	xmloff/util/xo \
 	xmlscript/util/xmlscript \
-	$(if $(filter-out WNT MACOSX ANDROID IOS,$(OS)),xmlsecurity/util/xsec_gpg) \
 	$(if $(ENABLE_NSS), \
 		xmlsecurity/util/xmlsecurity \
+		$(if $(filter-out WNT MACOSX ANDROID IOS,$(OS)),xmlsecurity/util/xsec_gpg) \
 		xmlsecurity/util/xsec_xmlsec$(if $(filter WNT,$(OS)),.windows)) \
 	$(if $(ENABLE_COINMP), \
 		sccomp/source/solver/coinmpsolver \


More information about the Libreoffice-commits mailing list