Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv24185
Modified Files:
changelog rules
Log Message:
Add ARCH_PREFIX for build commands to be run using 'sparc32' on sparc
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -d -r1.193 -r1.194
--- changelog 1 Oct 2003 11:36:35 -0000 1.193
+++ changelog 1 Oct 2003 11:40:46 -0000 1.194
@@ -73,10 +73,12 @@
* debian/scripts/vars:
+ add OOO_ICONS_VER variable [MK]
+ Use patchset OOO_1_1_0 [CH]
+ + Add ARCH_PREFIX for build commands to be run using 'sparc32' on
+ sparc [CH]
* debian/setperms:
+ add xcftobmp [RE]
- -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 30 Sep 2003 22:47:46 +0200
+ -- Chris Halls <[EMAIL PROTECTED]> Wed, 1 Oct 2003 10:45:38 +0000
openoffice.org (1.0.99+1.1rc3-1) unstable; urgency=low
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- rules 1 Oct 2003 11:36:35 -0000 1.131
+++ rules 1 Oct 2003 11:40:46 -0000 1.132
@@ -215,12 +215,7 @@
#command to use to build OOo
BUILDCMD:=XCLASSPATH=$$XCLASSPATH::/usr/share/java/crimson.jar:/usr/share/java/xalan.jar:/usr/share/java/xml-apis.jar:/usr/share/java/xalan2.jar
-ifeq "$(ARCH)" "sparc"
-# OOo isn't 64-bit clean - always build in 32 bit on Sparc
-BUILDCMD+= sparc32
-endif
-
-BUILDCMD+= $(CURDIR)/$(SOURCE_TREE)/solenv/bin/build.pl
+BUILDCMD+= $(ARCH_PREFIX) $(CURDIR)/$(SOURCE_TREE)/solenv/bin/build.pl
# Because of the stampdir magic, when you actually want to run a rule
# over, you would have to remove the stamp manually. Now, just do
@@ -520,7 +515,7 @@
rm -f $(SOURCE_TREE)/config_office/config.cache
cd $(SOURCE_TREE)/config_office && autoconf && \
- CC="$(_CC)" CXX="$(CXX)" sh ./configure \
+ CC="$(_CC)" CXX="$(CXX)" $(ARCH_PREFIX) sh ./configure \
--with-lang=ALL \
--with-jdk-home=$(JDK_HOME) \
--enable-libart \
@@ -539,7 +534,7 @@
$(STAMP_DIR)/bootstrap: $(STAMP_DIR)/configure
dh_testdir
- cd $(SOURCE_TREE); ./bootstrap
+ cd $(SOURCE_TREE); $(ARCH_PREFIX) ./bootstrap
# Copy files needed when building with libgpc (this is non-free and
# therefore not part of the official Debian packages)
