[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.3.3-1-6-g02d0126



The following commit has been merged in the master branch:
commit 02d01260be81c4b915bff3874745699c9492672a
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Jun 25 21:26:25 2011 +0200

    Revert "don't hardcode JDK=gcj-jdk archs but use OOO_GCJ_JDK_ARCHS"
    
    This reverts commit 35c440698999ac8c98e0a059c9caec674b57e828.

diff --git a/rules b/rules
index 8eb0895..31201bb 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 $(OOO_GCJ_JDK_ARCHS), $(ARCH)))
+  ifneq (,$(filter hppa ia64 mips% kfreebsd%, $(ARCH)))
     JDK=gcj-jdk
   endif
 endif

-- 
LibreOffice packaging repository


Reply to: