./packages/openofficeorg/2.4/unstable r1058: explicitely specify --host and --build
------------------------------------------------------------
revno: 1058
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2008-04-11 10:22:38 +0200
message:
explicitely specify --host and --build
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-04-10 08:35:08 +0000
+++ b/changelog 2008-04-11 08:22:38 +0000
@@ -1,7 +1,7 @@
openoffice.org (1:2.4.0-3.4pre) unstable; urgency=low
* ooo-build:
- - update (r12143)
+ - update (r12153)
+ disables cjk-character-units-*.diff as they cause some problems
(closes: #474028)
+ emf+-canvas-vcl-non-closed-polygon.diff: fixed invalid access
@@ -15,6 +15,8 @@
python-central >= 0.6
- bump libstlport4.6-dev builddep to ensure building against
libstlport4.6ldbl
+ * debian/rules, ooo-build/patches/src680/configures-explicit-arch.diff:
+ explicitely specify --host and --build (closes: #475037)
- set MOZILLA= when arch not in OOO_MOZILLA_ARCHS
- fix OOO_OGLTRANS_ARCHS conditional
* merge from Ubuntu:
@@ -25,7 +27,7 @@
- debian/control.reportdesign.in:
+ change %OOO_ARCHS% to %OOO_JAVA_ARCHS%
- -- Rene Engelhard <rene@debian.org> Mon, 07 Apr 2008 15:37:14 +0200
+ -- Rene Engelhard <rene@debian.org> Fri, 11 Apr 2008 10:21:07 +0200
openoffice.org (1:2.4.0-3) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2008-04-09 19:34:31 +0000
+++ b/rules 2008-04-11 08:22:38 +0000
@@ -37,6 +37,9 @@
ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
DIST := $(shell lsb_release -is)
DISTREL := $(shell lsb_release -cs)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
# Figure out who's building this package.
OOO_VENDOR:=Debian
ifeq "$(DIST)" "Ubuntu"
@@ -179,7 +182,8 @@
--enable-lockdown \
--enable-openxml \
--with-drink=coffee \
- --libdir=/usr/lib
+ --libdir=/usr/lib \
+ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
# distro-configs is too late; it already gets searched in unpack
# when we don't do that here, too.
Reply to: