r903 ./packages/openofficeorg/2.3/experimental: disable mozilla-openoffice.org for 64bit; default to -P<number of cores> for PARALLEL_BUILD=y
------------------------------------------------------------
revno: 903
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2007-10-12 14:06:51 +0200
message:
disable mozilla-openoffice.org for 64bit; default to -P<number of cores> for PARALLEL_BUILD=y
modified:
changelog
control
control.mozilla.in
rules
=== modified file 'changelog'
--- a/changelog 2007-10-11 15:57:12 +0000
+++ b/changelog 2007-10-12 12:06:51 +0000
@@ -1,7 +1,7 @@
openoffice.org (1:2.3.0-1.2pre) experimental; urgency=low
* ooo-build:
- - update (r10448)
+ - update (r10461)
[ Rene Engelhard ]
* debian/rules:
@@ -13,12 +13,15 @@
- fix ooo-extension.desktop fixing
- we build against libcurl3-gnutls, so build against libneon26-gnutls for
consistency
+ - default to -P<number of cores> for PARALLEL_BUILD=y
* debian/control.in:
- make -report-builder depend on -java-common (>= 1:2.3.0~oog680m1) as
that apparently is needed
* debian/copyright:
- point to /usr/share/common-licenses/LGPL-2.1 instead of just LGPL
as OOo is LGPL 2.1 only
+ * debian/control.mozilla.in, debian/rules:
+ - don't build mozilla-openoffice.org on amd64/ppc64, broken
[ Mirco Bauer ]
* debian/rules:
@@ -28,7 +31,7 @@
* debian/control.mono.in:
- enhanced package description
- -- Rene Engelhard <rene@debian.org> Fri, 05 Oct 2007 19:34:46 +0200
+ -- Rene Engelhard <rene@debian.org> Fri, 12 Oct 2007 11:36:52 +0200
openoffice.org (1:2.3.0-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2007-10-11 15:57:12 +0000
+++ b/control 2007-10-12 12:06:51 +0000
@@ -2877,7 +2877,7 @@
Package: mozilla-openoffice.org
Section: net
-Architecture: i386 powerpc sparc amd64 ppc64
+Architecture: i386 powerpc sparc
Enhances: iceape-browser,
iceweasel,
mozilla-browser,
=== modified file 'control.mozilla.in'
--- a/control.mozilla.in 2007-07-01 20:20:14 +0000
+++ b/control.mozilla.in 2007-10-12 12:06:51 +0000
@@ -1,6 +1,6 @@
Package: mozilla-openoffice.orgVER
Section: net
-Architecture: %OOO_ARCHS%
+Architecture: %OOO_NPSOPLUGIN_ARCHS%
Enhances: iceape-browser,
iceweasel,
mozilla-browser,
=== modified file 'rules'
--- a/rules 2007-10-11 15:57:12 +0000
+++ b/rules 2007-10-12 12:06:51 +0000
@@ -236,6 +236,14 @@
ifeq (,$(findstring $(ARCH),$(OOO_MONO_ARCHS)))
ENABLE_MONO=n
endif
+# Mozilla plugin. Crashes on amd64
+OOO_NPSOPLUGIN_ARCHS = i386 powerpc sparc
+ifeq "$(BUILD_AMD64)" "y"
+ PACKAGE_NPSOPLUGIN=n
+endif
+ifeq "$(BUILD_PPC64)" "y"
+ PACKAGE_NPSOPLUGIN=n
+endif
ifeq "$(ARCH)-linux-gnu" "sparc-linux-gnu"
# use 32-bit compiler
@@ -677,8 +685,12 @@
NUM_CPUS := 1
ifeq "$(PARALLEL_BUILD)" "y"
AVAIL_CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
+ # according to Pavel Janik, build -P<number of cores> -- -P2
+ # is ideal. This sets the first -P according to the number
+ # of CPUs (where dual-core CPUS report 2, too)
+ # Default to 2 on 1-processor machines anyway
ifneq ($(AVAIL_CPUS),1)
- NUM_CPUS := $(shell expr $(AVAIL_CPUS) + 1)
+ NUM_CPUS := $(shell expr $(AVAIL_CPUS))
endif
endif
endif
@@ -1085,6 +1097,7 @@
perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_MONO_ARCHS%,$(OOO_MONO_ARCHS),g" debian/control
+ perl -pi -e "s,%OOO_NPSOPLUGIN_ARCHS%,$(OOO_NPSOPLUGIN_ARCHS),g" debian/control
ifeq "$(PACKAGE_QUICKSTART)" "y"
perl -pi -e 's#\(Widgets, Dialogs\)#\(Widgets, Dialogs, Quickstarter\)#' debian/control
Reply to: