* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-3.7-separate-checks.patch
@ 2012-09-25 9:53 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-09-25 9:53 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/09/25 09:53:19
Added: libreoffice-3.7-separate-checks.patch
Log:
Update checks patch to work on 3.7 branchie.
(Portage version: 2.2.0_alpha132/cvs/Linux x86_64)
Revision Changes Path
1.1 app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch?rev=1.1&content-type=text/plain
Index: libreoffice-3.7-separate-checks.patch
===================================================================
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-3.7-separate-checks.patch
@ 2012-11-09 19:29 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-11-09 19:29 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/11/09 19:29:14
Modified: libreoffice-3.7-separate-checks.patch
Log:
Fix patch to apply again.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Revision Changes Path
1.2 app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch?r1=1.1&r2=1.2
Index: libreoffice-3.7-separate-checks.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libreoffice-3.7-separate-checks.patch 25 Sep 2012 09:53:19 -0000 1.1
+++ libreoffice-3.7-separate-checks.patch 9 Nov 2012 19:29:14 -0000 1.2
@@ -1,56 +1,43 @@
-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
+index 9e67a71..64a7b6c 100644
--- a/Makefile.top
+++ b/Makefile.top
-@@ -251,7 +252,7 @@ xpdf\
- xsltml\
- zlib\
+@@ -244,7 +244,7 @@ stlport\
+ sysui\
+ xpdf\
-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 \
+ .PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).subsequentcheck $(1).deliver
+@@ -546,7 +546,7 @@ findunusedcode:
+ | grep -v ^WSObject \
> 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 $@
+ $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
-index 74d0f32..daa4ae0 100755
+index c8e62ee..11a9069 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
-@@ -1901,7 +1901,7 @@ sub run_job {
+@@ -1902,7 +1902,7 @@ sub run_job {
return 1 if (! $path =~ /prj$/ );
mkpath("$workdir/Logs");
- my $gbuild_flags = '-j' . $ENV{GMAKE_MODULE_PARALLELISM};
+ my $gbuild_flags = '-j' . $ENV{PARALLELISM};
- my $gbuild_target = 'all slowcheck';
+ my $gbuild_target = 'all';
if ($registered_name =~ /tail_build\/prj$/ )
{
- $gbuild_flags = '-j' . $ENV{GMAKE_PARALLELISM};
+ $gbuild_target = $ENV{gb_TAILBUILDTARGET};
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
-index e5f87f0..9c2608c 100644
+index 97f1a81..c7ae7f4 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
-@@ -129,7 +129,7 @@ gb_Module_DEVINSTALLHINT=
+@@ -139,7 +139,7 @@ gb_Module_DEVINSTALLHINT=
debugrun :| build
endif
@@ -59,6 +46,3 @@
$(info $(gb_Module_BUILDHINT))
build :
---
-1.7.9.5
-
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-3.7-separate-checks.patch
@ 2014-03-27 9:09 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2014-03-27 9:09 UTC (permalink / raw
To: gentoo-commits
scarabeus 14/03/27 09:09:58
Removed: libreoffice-3.7-separate-checks.patch
Log:
Drop 4.0 series. Sorry ppc guys I can't wait for stabilisation forever.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-03-27 9:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-09 19:29 [gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-3.7-separate-checks.patch Tomas Chvatal (scarabeus)
-- strict thread matches above, loose matches on Subject: below --
2014-03-27 9:09 Tomas Chvatal (scarabeus)
2012-09-25 9:53 Tomas Chvatal (scarabeus)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox