------------------------------------------------------------
revno: 2004
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Sun 2010-05-30 19:43:17 +0200
message:
OpenJDK crashes on runtime on armel, run the tests using gcj, still breaks
though so disable smoketest on armel for now
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-05-27 22:54:32 +0000
+++ b/changelog 2010-05-30 17:43:17 +0000
@@ -9,8 +9,10 @@
- use system mdds
- fix variable to not add kfreebsd-i386 to OOO_MONO_ARCHS twice but
to actually add it to OOO_MOZILLA_ARCHS
+ - OpenJDK crashes on runtime on armel, run the tests using gcj, still
+ breaks though so disable smoketest on armel for now
- -- Rene Engelhard <r...@debian.org> Fri, 28 May 2010 00:19:08 +0200
+ -- Rene Engelhard <r...@debian.org> Sat, 29 May 2010 15:21:30 +0200
openoffice.org (1:3.2.1~rc2-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2010-05-27 22:54:32 +0000
+++ b/rules 2010-05-30 17:43:17 +0000
@@ -540,6 +540,12 @@
OOO_NPSOPLUGIN_ARCHS=
endif
+# error: Database: Database Insert record into Database -> error
+# but also already in older versions, so...
+ifeq (armel,$(findstring armel,$(OOO_JAVA_ARCHS)))
+ RUN_SMOKETEST=n
+endif
+
# builds long and is for legacy filters. probably not needed on {arm,mips}{,el}
ifneq (,$(findstring arm,$(ARCH)))
BUILD_BINFILTERS=n
@@ -810,6 +816,11 @@
JAVA_HOME=/usr/lib/jvm/java-6-openjdk
CONFIGURE_FLAGS += --with-java-target-version=1.5
endif
+ ifeq "$(ARCH)" "armel"
+ TEST_JAVA_HOME=/usr/lib/jvm/java-gcj
+ else
+ TEST_JAVA_HOME=$(JAVA_HOME)
+ endif
ifeq "$(BUILD_JARS_NATIVE)" "y"
CONFIGURE_FLAGS += --enable-gcjaot
ifeq "$(LENNY_BACKPORT)" "y"
@@ -2029,6 +2040,7 @@
. $(CURDIR)/$(SOURCE_TREE)/*.sh; \
export PATH=$(BUILD_PATH); \
export TMPDIR=`mktemp -q -d`; \
+ export JAVA_HOME=$(TEST_JAVA_HOME); \
SAL_USE_VCLPLUGIN="svp" ../solenv/bin/build.pl
endif
ifeq "$(ENABLE_JAVA)" "y"
