------------------------------------------------------------
revno: 1218
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: experimental
timestamp: Thu 2008-08-14 17:06:46 -0300
message:
fix build with OpenJDK
modified:
rules
=== modified file 'rules'
--- a/rules 2008-08-14 20:05:51 +0000
+++ b/rules 2008-08-14 20:06:46 +0000
@@ -558,7 +558,6 @@
BUILD_DEPS += , ant (>= 1.6.5) [$(OOO_JAVA_ARCHS)]
endif
GCJ_VERSION = $(shell basename `readlink $(JAVA_HOME)/bin/gcj` | sed -e
s/gcj-//)
- GCJ_DBTOOL = gcj-dbtool-$(GCJ_VERSION)
SYSTEM_SAXON=y
ifneq "$(ETCH_BACKPORT)" "y"
GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`readlink
/usr/lib/libgcj_bc.so.1` | cut -d: -f1 | sed -e s/$$/-awt/)
@@ -1869,10 +1868,10 @@
AOT_MAKEFLAGS=-j$(NUM_CPUS) aot-compile -L /usr/lib/gcj/openoffice \
debian/tmp/native-jars debian/tmp/native-jars/gcj
endif
- $(GCJ_DBTOOL) -n debian/tmp/native-jars/tmp.db 64
+ gcj-dbtool -n debian/tmp/native-jars/tmp.db 64
find debian/tmp/native-jars/gcj -name '*.db' -print0 \
| xargs -r -0 \
- $(GCJ_DBTOOL) -m debian/tmp/native-jars/tmp.db
debian/tmp/native-jars/tmp.db || exit 1
+ gcj-dbtool -m debian/tmp/native-jars/tmp.db
debian/tmp/native-jars/tmp.db || exit 1
rm -f debian/tmp/native-jars/gcj/*.db
touch $@
