CVS:oo-deb/debian changelog,1.253,1.254 rules,1.178,1.179

[Chris Halls <halls@gluck.debian.org>]

Update of /home/halls/cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv6105

Modified Files:
	changelog rules 
Log Message:
* on Sparc, use sparc-linux-{gcc,g++} to force 32bit compile/link, instead
  of ARCH_PREFIX variable
* mention build-sparc-assember patch in changelog


Index: changelog
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -d -r1.253 -r1.254
--- changelog	5 Jan 2004 02:55:12 -0000	1.253
+++ changelog	6 Jan 2004 09:24:07 -0000	1.254
@@ -16,6 +16,7 @@
     - system-myspell: build and link dynamically with system myspell [RE]
     - system-altlinuxhyph: build with system altlinuxhyph (statically for now
       since there is no dynamic one) [RE]
+    - build-sparc-assembler: Use $(CC) for sparc assembler (closes: #218065) [CH]
   * Modified patches:
     - config-switches.diff: add new --with-system-* flags [RE]
   * debian/rules:
@@ -25,6 +26,8 @@
       woody), --with-system-sane, --with-system-curl
     - generate a list in openoffice.org-bin which contains used libs which
       then can used from oooprelink [RE]
+    - on Sparc, use sparc-linux-{gcc,g++} to force 32bit compile/link, instead
+      of ARCH_PREFIX variable [CH]
   * debian/control.in:
     - Remove Recommends: x-ttcidfont-conf since Debian fontconfig has defoma
       support now (thanks to Ozgur Murat Homurlu) [CH]

Index: rules
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -d -r1.178 -r1.179
--- rules	5 Jan 2004 02:55:12 -0000	1.178
+++ rules	6 Jan 2004 09:24:07 -0000	1.179
@@ -103,8 +103,14 @@
 # automatic configuration for woody backports
 # check that default compiler is not gcc 2.x (as it is on Woody)
 ifneq (gcc-2.9,$(findstring gcc-2.9,$(shell readlink /usr/bin/gcc)))
-  _CC:=gcc
-  CXX:=g++
+  ifeq ($(ARCH),sparc)
+    # Use 32 bit compiler
+    _CC:=sparc-linux-gcc
+    CXX:=sparc-linux-g++
+  else
+    _CC:=gcc
+    CXX:=g++
+  endif
   USE_SYSTEM_STLPORT=n
   #CONFIGURE_FLAGS+= --with-stlport4-home=$(CURDIR)/stlport-home
   USE_FONTCONFIG=y
@@ -251,7 +257,7 @@
 BUILDCMD+= XCLASSPATH=$$XCLASSPATH::/usr/share/java/crimson.jar:/usr/share/java/xalan.jar:/usr/share/java/xml-apis.jar:/usr/share/java/xalan2.jar
 endif
 
-BUILDCMD+= $(ARCH_PREFIX) $(CURDIR)/$(SOURCE_TREE)/solenv/bin/build.pl
+BUILDCMD+= $(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
@@ -594,7 +600,7 @@
 	# environemnt file for lang-specific file creation, the
 	# second for the binary build without all languages
 	cd $(SOURCE_TREE)/config_office && \
-	  CC="$(_CC)" CXX="$(CXX)" $(ARCH_PREFIX) sh ./configure \
+	  CC="$(_CC)" CXX="$(CXX)" sh ./configure \
 	   $(CONFIGURE_FLAGS) \
 	   $(CONFIGURE_LANGPACK_FLAGS) \
 	   < /dev/null
@@ -602,7 +608,7 @@
 
 	# Normal complete build with only one language
 	cd $(SOURCE_TREE)/config_office && \
-	  CC="$(_CC)" CXX="$(CXX)" $(ARCH_PREFIX) sh ./configure \
+	  CC="$(_CC)" CXX="$(CXX)" sh ./configure \
 	   $(CONFIGURE_FLAGS) \
 	   --with-lang=$(shell debian/local/openoffice-xlate-lang -r $(BUILDLANG)) \
 	   < /dev/null
@@ -614,7 +620,7 @@
 $(STAMP_DIR)/bootstrap: $(STAMP_DIR)/configure
 	dh_testdir
 
-	cd $(SOURCE_TREE); $(ARCH_PREFIX) ./bootstrap
+	cd $(SOURCE_TREE); ./bootstrap
 
 	touch $@