From e8c76b35182a24385949e28c76c56db0d86bb7b0 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 1 Apr 2011 16:40:24 +0200
Subject: add a java build tool directory

following build tools seem to be required to cross-compile
OpenJDK:
 - fastjar
 - classpath
 - gcj
 - jamvm
 - ecj

Maybe cacao is better, maybe ant is required, too.
... hacking...
---
 package/openjdk/Makefile | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'package/openjdk/Makefile')

diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index 73812e426..e3bb8d17f 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -36,6 +36,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,OPENJDK,openjdk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+
 ifeq ($(ADK_PACKAGE_OPENJDK_ZERO),y)
 CONFIGURE_ARGS+=	--enable-zero
 endif
@@ -51,7 +52,6 @@ CONFIGURE_ARGS+=	--disable-docs \
 			--with-xalan2-serializer-jar=/usr/share/java/serializer.jar \
 			--with-xerces2-jar=/usr/share/java/xercesImpl.jar \
 			--with-ecj-jar=$(TOPDIR)/dl/ecj.jar \
-			--with-gcj \
 			--without-rhino \
 			--disable-xrender \
 			--disable-nss
@@ -61,24 +61,28 @@ do-extract:
 	(cd $(WRKBUILD); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz)
 
 pre-configure:
-	(cd ${WRKBUILD}/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION); rm -rf config.{cache,status} ; \
+	(cd ${WRKBUILD}/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION); rm -rf config.{cache,status};\
+		export PATH="${PATH}:${STAGING_JAVA_HOST_DIR}/usr/bin"; \
+		export CLASSPATH="${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-4.5.2.jar:${STAGING_JAVA_HOST_DIR}/usr/share/java/ecj.jar";\
 		./configure \
 			--enable-bootstrap \
 			--enable-zero \
+			--with-jdk-home=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm \
+			--with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/jamvm \
+			--with-javac=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
+			--with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
+			--with-openjdk-src-dir=$(WRKBUILD)/$(PKG_NAME)-$(PKG_VERSION) \
+			--with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar \
 			--disable-docs \
 			--disable-openjdk-cross-compilation \
-			--with-openjdk-src-dir=$(WRKBUILD)/$(PKG_NAME)-$(PKG_VERSION) \
-			--with-jdk-home=$(STAGING_HOST_DIR)/lib/jvm \
 			--with-xalan2-jar=/usr/share/java/xalan.jar \
 			--with-xalan2-serializer-jar=/usr/share/java/serializer.jar \
 			--with-xerces2-jar=/usr/share/java/xercesImpl.jar \
-			--with-ecj-jar=$(TOPDIR)/dl/ecj.jar \
-			--with-gcj \
 			--without-rhino \
 			--disable-xrender \
 			--disable-nss \
 	);
-	(cd $(WRKBUILD)/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION) ; ${MAKE} )
+	(cd $(WRKBUILD)/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION) ; ${MAKE})
 
 openjdk-install:
 	$(INSTALL_DIR) $(IDIR_OPENJDK)/usr/bin
-- 
cgit v1.2.3