./packages/openofficeorg/3.0/experimental r1237: - add conditonal for cacao-oj6-jdk (which doesn't work, though,
------------------------------------------------------------
revno: 1237
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2008-08-24 14:11:35 +0200
message:
- add conditonal for cacao-oj6-jdk (which doesn't work, though,
testtool fails with the same error as seen in #495694)
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-08-24 07:46:16 +0000
+++ b/changelog 2008-08-24 12:11:35 +0000
@@ -2,10 +2,12 @@
* debian/rules:
- update lucene2 version
+ - add conditonal for cacao-oj6-jdk (which doesn't work, though,
+ testtool fails with the same error as seen in #495694)
* debian/control.ure.in:
- Section: libdevel for uno-libs3-dbg to fix override disparity
- -- Rene Engelhard <rene@debian.org> Sat, 23 Aug 2008 17:52:35 +0200
+ -- Rene Engelhard <rene@debian.org> Sun, 24 Aug 2008 14:08:08 +0200
openoffice.org (1:3.0.0~ooo300m3-2) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2008-08-24 07:43:59 +0000
+++ b/rules 2008-08-24 12:11:35 +0000
@@ -89,7 +89,12 @@
BUILD_DEPS=
BUILD_PYUNO=y
USE_PYCENTRAL=y
-PACKAGE_QA_TOOLS=y
+# causes out-of-memory
+ifeq "$(JDK)" "openjdk-cacao"
+ PACKAGE_QA_TOOLS=n
+else
+ PACKAGE_QA_TOOLS=y
+endif
PACKAGE_TTF_OPENSYMBOL=y
PACKAGE_PCVSLIB=n
BUILD_JARS_NATIVE=y
@@ -552,6 +557,10 @@
BUILD_DEPS += , openjdk-6-jdk [$(OOO_JAVA_ARCHS)]
JAVA_HOME=/usr/lib/jvm/java-6-openjdk
endif
+ ifeq "$(JDK)" "openjdk-cacao"
+ BUILD_DEPS += , cacao-oj6-jdk [$(OOO_JAVA_ARCHS)]
+ JAVA_HOME=/usr/lib/jvm/java-6-cacao
+ endif
ifeq "$(BUILD_JARS_NATIVE)" "y"
CONFIGURE_FLAGS += --enable-gcjaot
ifneq "$(ETCH_BACKPORT)" "y"
Reply to: