------------------------------------------------------------
revno: 1250
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: experimental
timestamp: Fri 2008-09-05 18:43:51 +0200
message:
--with-java-target-version=1.5 for builds with openjdk/cacao-oj6
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-09-05 16:41:52 +0000
+++ b/changelog 2008-09-05 16:43:51 +0000
@@ -14,6 +14,7 @@
- various conditional updates for new extension configure defaults
- temporarily disable report-builder as reportbuilder module is not
available in the tarballs yet...
+ - --with-java-target-version=1.5 for builds with openjdk/cacao-oj6
* debian/control.reportdesign.in:
- depend on OOo base and java-common with >= ${base-version} and conflict
against them with >= ${base-version}.1. According to the bug this
=== modified file 'rules'
--- a/rules 2008-09-05 16:41:52 +0000
+++ b/rules 2008-09-05 16:43:51 +0000
@@ -555,10 +555,12 @@
ifeq "$(JDK)" "openjdk"
BUILD_DEPS += , openjdk-6-jdk [$(OOO_JAVA_ARCHS)]
JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+ CONFIGURE_FLAGS += --with-java-target-version=1.5
endif
ifeq "$(JDK)" "openjdk-cacao"
BUILD_DEPS += , cacao-oj6-jdk [$(OOO_JAVA_ARCHS)]
JAVA_HOME=/usr/lib/jvm/java-6-cacao
+ CONFIGURE_FLAGS += --with-java-target-version=1.5
endif
ifeq "$(BUILD_JARS_NATIVE)" "y"
CONFIGURE_FLAGS += --enable-gcjaot
