You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/app-office/libreoffice/files/libreoffice-3.7-separate-ch...

65 lines
2.0 KiB

From 4fb35cfbf4b10d5644fd636ddfe3e07b5a932d45 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Sun, 24 Jun 2012 14:01:54 +0200
Subject: [PATCH] dont run check targets in build, to allow running them
separately later
Change-Id: Idb46ebcb427522c74632a1813afcbb841fb61243
---
Makefile.top | 10 ++++++++--
solenv/bin/build.pl | 2 +-
solenv/gbuild/Module.mk | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Makefile.top b/Makefile.top
index 7362bbc..ae849fb 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -251,7 +252,7 @@ xpdf\
xsltml\
zlib\
-export gb_TAILBUILDTARGET=all slowcheck
+export gb_TAILBUILDTARGET=all
define gbuild_module_rules
.PHONY: $(1) $(1).all $(1).clean $(1).deliver
@@ -526,7 +527,7 @@ findunusedcode:
| grep -v WPX \
> unusedcode.easy
-check: dev-install subsequentcheck
+check: unitcheck slowcheck dev-install subsequentcheck
subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install)
$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 74d0f32..daa4ae0 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1901,7 +1901,7 @@ sub run_job {
return 1 if (! $path =~ /prj$/ );
mkpath("$workdir/Logs");
my $gbuild_flags = '-j' . $ENV{GMAKE_MODULE_PARALLELISM};
- my $gbuild_target = 'all slowcheck';
+ my $gbuild_target = 'all';
if ($registered_name =~ /tail_build\/prj$/ )
{
$gbuild_flags = '-j' . $ENV{GMAKE_PARALLELISM};
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index e5f87f0..9c2608c 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -129,7 +129,7 @@ gb_Module_DEVINSTALLHINT=
debugrun :| build
endif
-all : build unitcheck
+all : build
$(info $(gb_Module_BUILDHINT))
build :
--
1.7.9.5