[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.4_rc2-1-12-g06be5b0
The following commit has been merged in the master branch:
commit 09ec84d67008916f526cd2a88aa59979e9e24d58
Author: Rene Engelhard <rene@debian.org>
Date: Sun Jun 3 22:52:52 2012 +0200
note internal hsqldb build failure with gcj
diff --git a/rules b/rules
index b481f1d..543e1b7 100755
--- a/rules
+++ b/rules
@@ -1069,6 +1069,10 @@ ifeq "$(ENABLE_JAVA)" "y"
BUILD_DEPS += , libhsqldb-java $(HSQLDB_MINVER)$(OOO_NO_JAVA_ARCHS)
BASE_HSQLDB_DEPENDS = libhsqldb-java $(HSQLDB_MINVER), libhsqldb-java (<< $(HSQLDB_TOONEWVER)~)
JAVA_GCJ_DEPENDS += , libhsqldb-java-gcj [$(OOO_GCJ_ARCHS)]
+ ifneq "$(JDK)" "openjdk"
+ # hsqldb with jdk7 buildfix (see jdk7.diff) fails with gcj
+ $(error hsqldb with jdk7 buildfix (see jdk7.diff) fails with gcj)
+ endif
endif
ifeq "$(ENABLE_SCRIPT_PROVIDER_BSH)" "y"
ifneq (,$(filter beanshell, $(SYSTEM_STUFF)))
--
LibreOffice packaging repository
Reply to: