From eb339e5dacc4d6333fe8cf55c9f79ab64a7e3809 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 3 Jun 2014 17:11:52 +0200
Subject: fix openjdk build, do not interfere with xbmc

---
 package/ecj/Makefile      | 4 ++--
 package/openjdk7/Makefile | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'package')

diff --git a/package/ecj/Makefile b/package/ecj/Makefile
index c8eb49488..5f0ad156c 100644
--- a/package/ecj/Makefile
+++ b/package/ecj/Makefile
@@ -33,8 +33,8 @@ ecj-hostinstall:
 	# put a wrapper for java here
 	mv ${STAGING_HOST_DIR}/usr/bin/gij ${STAGING_HOST_DIR}/usr/bin/gij.native
 	echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \
-		${STAGING_HOST_DIR}/usr/bin/java
-	chmod u+x ${STAGING_HOST_DIR}/usr/bin/java
+		${STAGING_HOST_DIR}/usr/bin/hostjava
+	chmod u+x ${STAGING_HOST_DIR}/usr/bin/hostjava
 	echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \
 		${STAGING_HOST_DIR}/usr/bin/gij
 	chmod u+x ${STAGING_HOST_DIR}/usr/bin/gij
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index 9147f5dbb..5a9e822a0 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -114,9 +114,9 @@ HOST_CONFIGURE_ARGS+=\
 		--enable-bootstrap \
 		--enable-zero \
 		--with-jdk-home=$(STAGING_HOST_DIR)/usr/lib/jvm \
-		--with-java=$(STAGING_HOST_DIR)/usr/bin/java \
+		--with-java=$(STAGING_HOST_DIR)/usr/bin/hostjava \
 		--with-javac=$(STAGING_HOST_DIR)/usr/bin/ecj \
-		--with-ecj-jar=${DL_DIR}/ecj.jar \
+		--with-ecj-jar=${DL_DIR}/ecj-4.9.jar \
 		--without-hotspot-build \
                 --disable-system-zlib \
                 --disable-system-jpeg \
-- 
cgit v1.2.3