[SCM] LibreOffice packaging repository branch, master, updated. 717705b21f3eb051397c5275a0f9586cea561846

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the master branch:
commit 717705b21f3eb051397c5275a0f9586cea561846
Author: Rene Engelhard <rene@debian.org>
Date:   Sun Apr 3 13:55:13 2011 +0000

    run dpkg -s gcj-jdk on openjdk-using archs only when we build -gcj

diff --git a/changelog b/changelog
index e2eb9fe..55f68fe 100644
--- a/changelog
+++ b/changelog
@@ -3,8 +3,12 @@ libreoffice (1:3.3.2-3) UNRELEASED; urgency=low
   * debian/rules, debian/control.in:
     - readd recommends for libtextcat-data though libtextcat0 depends on it.
       Makes more clear what we need now (see #620568)
+  * debian/rules:
+     - run dpkg -s gcj-jdk on openjdk-using archs only when we build -gcj,
+       as otherwise it's not installed on the buildds (and we end up with a
+       eventually "wrong" gcc). 
 
- -- Rene Engelhard <rene@debian.org>  Sat, 02 Apr 2011 23:40:19 +0200
+ -- Rene Engelhard <rene@debian.org>  Sun, 03 Apr 2011 13:52:47 +0000
 
 libreoffice (1:3.3.2-2) unstable; urgency=medium
 
diff --git a/rules b/rules
index cf88545..cf15832 100755
--- a/rules
+++ b/rules
@@ -439,19 +439,21 @@ CC_PREFIX:=$(shell gcc -dumpmachine)-
 
 ifeq "$(GCC_VERSION)" ""
   ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
-GCJ_JDK_PACKAGE=$(shell dpkg -s gcj-jdk | grep Depends | sed -e 's/.*\(gcj-[0-9]\.[0-9]-jdk\).*/\1/')
-GCJ_JDK_VERSION=$(shell echo $(GCJ_JDK_PACKAGE) | cut -d- -f2)
-    ifneq "$(SYSTEM_GCC_VERSION)" "$(GCJ_JDK_VERSION)"
+    ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_GCJ_ARCHS)))
+	GCJ_JDK_PACKAGE=$(shell dpkg -s gcj-jdk | grep Depends | sed -e 's/.*\(gcj-[0-9]\.[0-9]-jdk\).*/\1/')
+	GCJ_JDK_VERSION=$(shell echo $(GCJ_JDK_PACKAGE) | cut -d- -f2)
+      ifneq "$(SYSTEM_GCC_VERSION)" "$(GCJ_JDK_VERSION)"
         BUILD_DEPS += , gcc-$(GCJ_JDK_VERSION) [$(OOO_GCJ_JDK_ARCHS)], g++-$(GCJ_JDK_VERSION) [$(OOO_GCJ_JDK_ARCHS)]
-      ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_GCJ_JDK_ARCHS)))
+        ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_GCJ_JDK_ARCHS)))
 	# sanity check. amd64 is in kfreebsd-amd64; same for i386
-        ifneq ($(ARCH),$(findstring $(ARCH),$(OOO_OPENJDK_ARCHS)))
+          ifneq ($(ARCH),$(findstring $(ARCH),$(OOO_OPENJDK_ARCHS)))
           GCC_VERSION := $(GCJ_JDK_VERSION)
-        else
+          else
           GCC_VERSION := $(SYSTEM_GCC_VERSION)
+          endif
+        else
+	  GCC_VERSION := $(SYSTEM_GCC_VERSION)
         endif
-      else
-	GCC_VERSION := $(SYSTEM_GCC_VERSION)
       endif
     endif
   endif

-- 
LibreOffice packaging repository