[Libreoffice-commits] core.git: RepositoryModule_host.mk

Peter Foley pefoley2 at pefoley.com
Sat Sep 13 08:29:57 PDT 2014


 RepositoryModule_host.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2d8514575599dfcede1c5298a376d9f66ca35f71
Author: Peter Foley <pefoley2 at pefoley.com>
Date:   Thu Sep 11 18:05:01 2014 -0400

    Fix circular deps when opencl is disabled
    
    Change-Id: Ic68f3ae19ae55d507b80f4685966357d55cb47b9
    Reviewed-on: https://gerrit.libreoffice.org/11407
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 1ba50ec..6d9b51f 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -182,7 +182,8 @@ endef
 # the default goal is all (see Module.mk)
 ifeq (,$(filter-out all build check unitcheck slowcheck subsequentcheck,$(MAKECMDGOALS)))
 $(eval $(call repositorymodule_serialize,\
-	scfilt scopencl \
+	scfilt \
+	$(if $(ENABLE_OPENCL),scopencl) \
 	$(call gb_Helper_optional,SCRIPTING,vbaobj) \
 	sc msword \
 	$(call gb_Helper_optional,DESKTOP,swui) \


More information about the Libreoffice-commits mailing list