[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.3.3-1-5-g35c4406
The following commit has been merged in the master branch:
commit 35c440698999ac8c98e0a059c9caec674b57e828
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jun 25 18:03:05 2011 +0200
don't hardcode JDK=gcj-jdk archs but use OOO_GCJ_JDK_ARCHS
diff --git a/rules b/rules
index 31201bb..8eb0895 100755
--- a/rules
+++ b/rules
@@ -131,7 +131,7 @@ BUILD_ONLY_EN_US=n
ENABLE_JAVA=y
ifeq "$(ENABLE_JAVA)" "y"
JDK=openjdk
- ifneq (,$(filter hppa ia64 mips% kfreebsd%, $(ARCH)))
+ ifneq (,$(filter $(OOO_GCJ_JDK_ARCHS), $(ARCH)))
JDK=gcj-jdk
endif
endif
--
LibreOffice packaging repository
Reply to: