/[gentoo-x86]/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch
Gentoo

Diff of /app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.1 Revision 1.2
1From 4fb35cfbf4b10d5644fd636ddfe3e07b5a932d45 Mon Sep 17 00:00:00 2001
2From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
3Date: Sun, 24 Jun 2012 14:01:54 +0200
4Subject: [PATCH] dont run check targets in build, to allow running them
5 separately later
6
7Change-Id: Idb46ebcb427522c74632a1813afcbb841fb61243
8---
9 Makefile.top | 10 ++++++++--
10 solenv/bin/build.pl | 2 +-
11 solenv/gbuild/Module.mk | 2 +-
12 3 files changed, 10 insertions(+), 4 deletions(-)
13
14diff --git a/Makefile.top b/Makefile.top 1diff --git a/Makefile.top b/Makefile.top
15index 7362bbc..ae849fb 100644 2index 9e67a71..64a7b6c 100644
16--- a/Makefile.top 3--- a/Makefile.top
17+++ b/Makefile.top 4+++ b/Makefile.top
18@@ -251,7 +252,7 @@ xpdf\ 5@@ -244,7 +244,7 @@ stlport\
19 xsltml\ 6 sysui\
20 zlib\ 7 xpdf\
21 8
22-export gb_TAILBUILDTARGET=all slowcheck 9-export gb_TAILBUILDTARGET=all slowcheck
23+export gb_TAILBUILDTARGET=all 10+export gb_TAILBUILDTARGET=all
24 11
25 define gbuild_module_rules 12 define gbuild_module_rules
26 .PHONY: $(1) $(1).all $(1).clean $(1).deliver 13 .PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).subsequentcheck $(1).deliver
27@@ -526,7 +527,7 @@ findunusedcode: 14@@ -546,7 +546,7 @@ findunusedcode:
28 | grep -v WPX \ 15 | grep -v ^WSObject \
29 > unusedcode.easy 16 > unusedcode.easy
30 17
31-check: dev-install subsequentcheck 18-check: dev-install subsequentcheck
32+check: unitcheck slowcheck dev-install subsequentcheck 19+check: unitcheck slowcheck dev-install subsequentcheck
33 20
34 subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install) 21 subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install)
35 $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@ 22 $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
36diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl 23diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
37index 74d0f32..daa4ae0 100755 24index c8e62ee..11a9069 100755
38--- a/solenv/bin/build.pl 25--- a/solenv/bin/build.pl
39+++ b/solenv/bin/build.pl 26+++ b/solenv/bin/build.pl
40@@ -1901,7 +1901,7 @@ sub run_job { 27@@ -1902,7 +1902,7 @@ sub run_job {
41 return 1 if (! $path =~ /prj$/ ); 28 return 1 if (! $path =~ /prj$/ );
42 mkpath("$workdir/Logs"); 29 mkpath("$workdir/Logs");
43 my $gbuild_flags = '-j' . $ENV{GMAKE_MODULE_PARALLELISM}; 30 my $gbuild_flags = '-j' . $ENV{PARALLELISM};
44- my $gbuild_target = 'all slowcheck'; 31- my $gbuild_target = 'all slowcheck';
45+ my $gbuild_target = 'all'; 32+ my $gbuild_target = 'all';
46 if ($registered_name =~ /tail_build\/prj$/ ) 33 if ($registered_name =~ /tail_build\/prj$/ )
47 { 34 {
48 $gbuild_flags = '-j' . $ENV{GMAKE_PARALLELISM}; 35 $gbuild_target = $ENV{gb_TAILBUILDTARGET};
49diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk 36diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
50index e5f87f0..9c2608c 100644 37index 97f1a81..c7ae7f4 100644
51--- a/solenv/gbuild/Module.mk 38--- a/solenv/gbuild/Module.mk
52+++ b/solenv/gbuild/Module.mk 39+++ b/solenv/gbuild/Module.mk
53@@ -129,7 +129,7 @@ gb_Module_DEVINSTALLHINT= 40@@ -139,7 +139,7 @@ gb_Module_DEVINSTALLHINT=
54 debugrun :| build 41 debugrun :| build
55 endif 42 endif
56 43
57-all : build unitcheck 44-all : build unitcheck
58+all : build 45+all : build
59 $(info $(gb_Module_BUILDHINT)) 46 $(info $(gb_Module_BUILDHINT))
60 47
61 build : 48 build :
62--
631.7.9.5
64

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2

  ViewVC Help
Powered by ViewVC 1.1.20