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

Contents of /app-office/libreoffice/files/libreoffice-3.6-separate-checks.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Thu Jul 11 09:05:41 2013 UTC (11 months, 4 weeks ago) by scarabeus
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Version bump to 4.1.0.2 remove 4.1older and 3.6.x series.

(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

1 From 4fb35cfbf4b10d5644fd636ddfe3e07b5a932d45 Mon Sep 17 00:00:00 2001
2 From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
3 Date: Sun, 24 Jun 2012 14:01:54 +0200
4 Subject: [PATCH] dont run check targets in build, to allow running them
5 separately later
6
7 Change-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
14 diff --git a/Makefile.top b/Makefile.top
15 index 7362bbc..ae849fb 100644
16 --- a/Makefile.top
17 +++ b/Makefile.top
18 @@ -243,7 +243,7 @@ xsltml\
19 zlib\
20
21 gb_TAILBUILDMODULES := $(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules)
22 -export gb_TAILBUILDTARGET=all slowcheck
23 +export gb_TAILBUILDTARGET=all
24
25 define gbuild_module_rules
26 .PHONY: $(1) $(1).all $(1).clean $(1).deliver
27 @@ -480,11 +480,17 @@ findunusedcode:
28 | grep -v WPX \
29 > unusedcode.easy
30
31 -check: dev-install subsequentcheck
32 +check: unitcheck slowcheck dev-install subsequentcheck
33
34 subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install)
35 $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
36
37 +unitcheck:
38 + $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
39 +
40 +slowcheck:
41 + $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
42 +
43 debugrun:
44 $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
45
46 diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
47 index 74d0f32..daa4ae0 100755
48 --- a/solenv/bin/build.pl
49 +++ b/solenv/bin/build.pl
50 @@ -1901,7 +1901,7 @@ sub run_job {
51 return 1 if (! $path =~ /prj$/ );
52 mkpath("$workdir/Logs");
53 my $gbuild_flags = '-j' . $ENV{GMAKE_MODULE_PARALLELISM};
54 - my $gbuild_target = 'all slowcheck';
55 + my $gbuild_target = 'all';
56 if ($registered_name =~ /tail_build\/prj$/ )
57 {
58 $gbuild_flags = '-j' . $ENV{GMAKE_PARALLELISM};
59 diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
60 index e5f87f0..9c2608c 100644
61 --- a/solenv/gbuild/Module.mk
62 +++ b/solenv/gbuild/Module.mk
63 @@ -129,7 +129,7 @@ gb_Module_DEVINSTALLHINT=
64 debugrun :| build
65 endif
66
67 -all : build unitcheck
68 +all : build
69 $(info $(gb_Module_BUILDHINT))
70
71 build :
72 --
73 1.7.9.5

  ViewVC Help
Powered by ViewVC 1.1.20