[Libreoffice-commits] core.git: 2 commits - RepositoryFixes.mk Repository.mk solenv/gbuild

[Matúš Kukan]

 Repository.mk                                   |    5 ++---
 RepositoryFixes.mk                              |   10 ----------
 solenv/gbuild/Module.mk                         |   15 ---------------
 solenv/gbuild/extensions/post_SpeedUpTargets.mk |    1 +
 4 files changed, 3 insertions(+), 28 deletions(-)

New commits:
commit 808d14765bcf57870c9306c40a431e525b0eaa71
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Apr 15 21:22:53 2013 +0200

    do not register dbtools if we don't use it
    
    Change-Id: Ie392d0468f1398dce7cb3601ee3284bcaef30fcf

diff --git a/Repository.mk b/Repository.mk
index 4a7e184..15c3481 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -230,7 +230,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
     dba \
     dbase \
     dbmm \
-    dbtools \
+    $(if $(DISABLE_DBCONNECTIVITY),,dbtools) \
     dbaxml \
 	deploymentmisc \
 	$(if $(filter unx,$(GUIBASE)),desktop_detector) \
@@ -385,8 +385,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     textconversiondlgs \
     textfd \
     updatecheckui \
-    $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
-        vbahelper) \
+    $(if $(DISABLE_SCRIPTING),,vbahelper) \
     vclplug_gen \
     vclplug_gtk \
     vclplug_gtk3 \
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index a6b9367..1ee9955 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -143,14 +143,4 @@ endif # ifeq ($(COM),GCC)
 
 endif # ifeq ($(OS),WNT)
 
-ifeq (,$(filter SCRIPTING,$(BUILD_TYPE)))
-
-gb_Library_FILENAMES := $(patsubst vbahelper:libvbahelper%,,$(gb_Library_FILENAMES))
-
-endif
-
-ifeq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
-gb_Library_FILENAMES := $(patsubst dbtools:libdbtools%,,$(gb_Library_FILENAMES))
-endif
-
 # vim: set noet sw=4 ts=4:
commit c2d9639efae97a373e6bdf01176d94a44b19d9b9
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Apr 15 21:16:23 2013 +0200

    avoid unit testing when cross-compiling more simple
    
    This reverts commit d4ea8c6b7ee32dfbe1525cae45ad44d411052c33.
    
    Change-Id: I85dacbf962cf5911c826c55fe08cfe6effe0e9d7

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 176bbec..e451563 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -212,19 +212,6 @@ $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
 
 endef
 
-ifeq ($(CROSS_COMPILING),YES)
-
-define gb_Module_add_check_target
-endef
-
-define gb_Module_add_slowcheck_target
-endef
-
-define gb_Module_add_subsequentcheck_target
-endef
-
-else
-
 define gb_Module_add_check_target
 $(call gb_Module__read_targetfile,$(1),$(2),check target)
 
@@ -249,8 +236,6 @@ $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
 
 endef
 
-endif
-
 define gb_Module_add_moduledir
 include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))/$(2)/Module_$(2).mk
 $(call gb_Module_get_target,$(1)) : $$(firstword $$(gb_Module_TARGETSTACK))
diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index 1e07a5f..90a0c76 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -27,6 +27,7 @@
 
 ifeq ($(CROSS_COMPILING),YES)
 gb_Module_add_targets_for_build :=
+gb_Module_SKIPTARGETS := check slowcheck subsequentcheck
 endif
 
 ifeq ($(gb_Side),build)