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...
---
 jtools/Makefile           | 29 +++++++++++++++++++++++++++++
 jtools/cacao/Makefile     | 35 +++++++++++++++++++++++++++++++++++
 jtools/classpath/Makefile | 36 ++++++++++++++++++++++++++++++++++++
 jtools/ecj/Makefile       | 21 +++++++++++++++++++++
 jtools/fastjar/Makefile   | 27 +++++++++++++++++++++++++++
 jtools/gcj/Makefile       | 41 +++++++++++++++++++++++++++++++++++++++++
 jtools/jamvm/Makefile     | 27 +++++++++++++++++++++++++++
 jtools/rules.mk           |  7 +++++++
 8 files changed, 223 insertions(+)
 create mode 100644 jtools/Makefile
 create mode 100644 jtools/cacao/Makefile
 create mode 100644 jtools/classpath/Makefile
 create mode 100644 jtools/ecj/Makefile
 create mode 100644 jtools/fastjar/Makefile
 create mode 100644 jtools/gcj/Makefile
 create mode 100644 jtools/jamvm/Makefile
 create mode 100644 jtools/rules.mk

(limited to 'jtools')

diff --git a/jtools/Makefile b/jtools/Makefile
new file mode 100644
index 000000000..932cd298f
--- /dev/null
+++ b/jtools/Makefile
@@ -0,0 +1,29 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+TARGETS:=
+ifneq ($(ADK_PACKAGE_OPENJDK),)
+TARGETS+=fastjar gcj classpath jamvm ecj
+endif
+
+TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
+TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
+
+all: install
+compile:
+install: $(TARGETS_INSTALL)
+clean: $(TARGETS_CLEAN)
+
+%-compile: $(TOOLS_BUILD_DIR)
+	$(TRACE) "jtools/$(patsubst %-compile,%,$@)/compile "
+	$(MAKE) -C $(patsubst %-compile,%,$@) compile
+
+%-install:
+	$(TRACE) "jtools/$(patsubst %-install,%,$@)/install "
+	$(MAKE) -C $(patsubst %-install,%,$@) install
+
+%-clean:
+	$(TRACE) "jtools/$(patsubst %-clean,%,$@)/clean "
+	$(MAKE) -C $(patsubst %-clean,%,$@) clean
diff --git a/jtools/cacao/Makefile b/jtools/cacao/Makefile
new file mode 100644
index 000000000..6d4b76d1f
--- /dev/null
+++ b/jtools/cacao/Makefile
@@ -0,0 +1,35 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		cacao
+PKG_VERSION:=		0.99.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
+PKG_SITES:=		http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/
+
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+
+include ../rules.mk
+
+install: ${STAGING_HOST_DIR}/usr/bin/cacao
+
+$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
+	(cd $(WRKBUILD); ./configure --prefix=/usr --disable-libjvm --enable-debug \
+		--with-vm-zip=$(STAGING_HOST_DIR)/usr/share/cacao/vm.zip \
+		--with-java-runtime-library=gnuclasspath \
+		--with-java-runtime-library-classes=$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip \
+		--with-java-runtime-library-prefix=$(STAGING_HOST_DIR)/usr \
+		--with-jni_md_h=$(STAGING_HOST_DIR)/usr/include \
+	);
+	touch $@
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
+	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
+	touch $@
+
+${STAGING_HOST_DIR}/usr/bin/cacao: $(WRKBUILD)/.compiled
+	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_HOST_DIR) install $(MAKE_TRACE)
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/classpath/Makefile b/jtools/classpath/Makefile
new file mode 100644
index 000000000..059790565
--- /dev/null
+++ b/jtools/classpath/Makefile
@@ -0,0 +1,36 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		classpath
+PKG_VERSION:=		0.98
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		90c6571b8b0309e372faa0f9f6255ea9
+PKG_SITES:=		${MASTER_SITE_GNU:=classpath/}
+
+include ../rules.mk
+
+install: ${STAGING_JAVA_HOST_DIR}/usr/share/classpath/glibj.zip
+
+$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
+	(cd $(WRKBUILD); ./configure --prefix=/usr \
+		--disable-local-sockets \
+		--disable-alsa \
+		--disable-gconf-peer \
+		--disable-gtk-peer \
+		--disable-qt-peer \
+		--disable-dssi \
+		--disable-plugin \
+		--disable-examples \
+		--disable-Werror)
+	touch $@
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
+	${MAKE} -C ${WRKBUILD}
+	touch $@
+
+${STAGING_JAVA_HOST_DIR}/usr/share/classpath/glibj.zip: $(WRKBUILD)/.compiled
+	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile
new file mode 100644
index 000000000..504c97350
--- /dev/null
+++ b/jtools/ecj/Makefile
@@ -0,0 +1,21 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		ecj
+PKG_VERSION:=		1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
+
+include ../rules.mk
+
+install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
+
+${STAGING_JAVA_HOST_DIR}/usr/bin/ecj:
+	$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -static -O2 -m64 -Wl,-Bsymbolic -findirect-dispatch \
+		-o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj --main=org.eclipse.jdt.internal.compiler.batch.Main \
+		$(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar
+	$(CP) $(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar ${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/fastjar/Makefile b/jtools/fastjar/Makefile
new file mode 100644
index 000000000..744776eac
--- /dev/null
+++ b/jtools/fastjar/Makefile
@@ -0,0 +1,27 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		fastjar
+PKG_VERSION:=		0.94
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		14d4bdfac236e347d806c6743dba48c6
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=fastjar/}
+
+include ../rules.mk
+
+install: ${STAGING_JAVA_HOST_DIR}/usr/bin/fastjar
+
+$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
+	(cd $(WRKBUILD); ./configure --prefix=/usr);
+	touch $@
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
+	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
+	touch $@
+
+${STAGING_JAVA_HOST_DIR}/usr/bin/fastjar: $(WRKBUILD)/.compiled
+	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile
new file mode 100644
index 000000000..ba31c27ea
--- /dev/null
+++ b/jtools/gcj/Makefile
@@ -0,0 +1,41 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		gcj
+PKG_VERSION:=		4.5.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		d6559145853fbaaa0fd7556ed93bce9a
+PKG_SITES:=		${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/}
+DISTFILES:=		gcc-$(PKG_VERSION).tar.bz2
+
+WRKDIST=		${WRKDIR}/gcc-${PKG_VERSION}
+
+include ../rules.mk
+
+install: ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj
+
+$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
+	(cd $(WRKBUILD); \
+		wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-latest.jar; \
+		./configure --prefix=/usr --enable-java-home --enable-languages=java --with-ffi \
+			--with-mpc=$(STAGING_HOST_DIR) --with-mpfr=$(STAGING_HOST_DIR) \
+			--with-gmp=$(STAGING_HOST_DIR) \
+			--disable-libmudflap \
+                        --disable-libgomp \
+                        --disable-biarch \
+                        --disable-decimal-float \
+                        --disable-multilib \
+	);
+	touch $@
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
+	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
+	touch $@
+
+${STAGING_JAVA_HOST_DIR}/usr/bin/gcj: $(WRKBUILD)/.compiled
+	$(INSTALL_DIR) ${STAGING_JAVA_HOST_DIR}
+	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/jamvm/Makefile b/jtools/jamvm/Makefile
new file mode 100644
index 000000000..f02450fb0
--- /dev/null
+++ b/jtools/jamvm/Makefile
@@ -0,0 +1,27 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		jamvm
+PKG_VERSION:=		1.5.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
+
+include ../rules.mk
+
+install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm
+
+$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
+	(cd $(WRKBUILD); ./configure --prefix=/usr --with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR) );
+	touch $@
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
+	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
+	touch $@
+
+${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm: $(WRKBUILD)/.compiled
+	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/rules.mk b/jtools/rules.mk
new file mode 100644
index 000000000..7b1d8e866
--- /dev/null
+++ b/jtools/rules.mk
@@ -0,0 +1,7 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+WRKDIR_BASE=    ${JTOOLS_BUILD_DIR}
+WRKDIR=		${WRKDIR_BASE}
+
+include ${TOPDIR}/mk/buildhlp.mk
-- 
cgit v1.2.3


From 828b812f7e09b018a6c5e2e4045029e1676c1867 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 1 Apr 2011 22:15:57 +0200
Subject: now icedtea starts with compile....

---
 jtools/classpath/Makefile | 4 ++--
 jtools/ecj/Makefile       | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'jtools')

diff --git a/jtools/classpath/Makefile b/jtools/classpath/Makefile
index 059790565..253f9604d 100644
--- a/jtools/classpath/Makefile
+++ b/jtools/classpath/Makefile
@@ -14,7 +14,7 @@ include ../rules.mk
 install: ${STAGING_JAVA_HOST_DIR}/usr/share/classpath/glibj.zip
 
 $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
-	(cd $(WRKBUILD); ./configure --prefix=/usr \
+	(cd $(WRKBUILD); ./configure --prefix=${STAGING_JAVA_HOST_DIR}/usr \
 		--disable-local-sockets \
 		--disable-alsa \
 		--disable-gconf-peer \
@@ -31,6 +31,6 @@ $(WRKBUILD)/.compiled: ${WRKDIST}/.configured
 	touch $@
 
 ${STAGING_JAVA_HOST_DIR}/usr/share/classpath/glibj.zip: $(WRKBUILD)/.compiled
-	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install
+	${MAKE} -C ${WRKBUILD} install
 
 include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile
index 504c97350..ffa6cd43e 100644
--- a/jtools/ecj/Makefile
+++ b/jtools/ecj/Makefile
@@ -13,7 +13,9 @@ include ../rules.mk
 install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
 
 ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj:
-	$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -static -O2 -m64 -Wl,-Bsymbolic -findirect-dispatch \
+	env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
+	PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$$PATH \
+	$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -O2 -Wl,-Bsymbolic -findirect-dispatch \
 		-o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj --main=org.eclipse.jdt.internal.compiler.batch.Main \
 		$(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar
 	$(CP) $(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar ${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar
-- 
cgit v1.2.3


From 10a925546005b9fdce4e660d62004782a0067461 Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 2 Apr 2011 13:21:36 +0000
Subject: speed up building gcj by disabling gcc bootstrap (since gcc from here
 is not used anyway, pointless)

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 jtools/gcj/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'jtools')

diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile
index ba31c27ea..60cf4fca7 100644
--- a/jtools/gcj/Makefile
+++ b/jtools/gcj/Makefile
@@ -27,6 +27,7 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
                         --disable-biarch \
                         --disable-decimal-float \
                         --disable-multilib \
+			--disable-bootstrap \
 	);
 	touch $@
 
-- 
cgit v1.2.3


From ca1f81baa087bd0003db4d9417cef1bc849c5c5d Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 2 Apr 2011 13:58:10 +0000
Subject: unbreak build on the Macintosh by specifying explicit fastjar
 location

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 jtools/gcj/Makefile | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'jtools')

diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile
index 60cf4fca7..873e6c21c 100644
--- a/jtools/gcj/Makefile
+++ b/jtools/gcj/Makefile
@@ -19,14 +19,22 @@ install: ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj
 $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
 	(cd $(WRKBUILD); \
 		wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-latest.jar; \
-		./configure --prefix=/usr --enable-java-home --enable-languages=java --with-ffi \
-			--with-mpc=$(STAGING_HOST_DIR) --with-mpfr=$(STAGING_HOST_DIR) \
+		export ac_cv_prog_JAR=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar; \
+		export JAR=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar; \
+		./configure \
+			--prefix=/usr \
+			--enable-java-home \
+			--enable-languages=java \
+			--with-ffi \
+			--with-mpc=$(STAGING_HOST_DIR) \
+			--with-mpfr=$(STAGING_HOST_DIR) \
 			--with-gmp=$(STAGING_HOST_DIR) \
+			--with-jar=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar \
 			--disable-libmudflap \
-                        --disable-libgomp \
-                        --disable-biarch \
-                        --disable-decimal-float \
-                        --disable-multilib \
+			--disable-libgomp \
+			--disable-biarch \
+			--disable-decimal-float \
+			--disable-multilib \
 			--disable-bootstrap \
 	);
 	touch $@
-- 
cgit v1.2.3


From d0e8617911c7b0a072c07c9da3a3a8c4ab357e0b Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 2 Apr 2011 15:49:08 +0000
Subject: use environment for configure, make and make install
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

just to be sure it’s picked up correctly at all times

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 jtools/gcj/Makefile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'jtools')

diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile
index 873e6c21c..0c29e3124 100644
--- a/jtools/gcj/Makefile
+++ b/jtools/gcj/Makefile
@@ -14,14 +14,15 @@ WRKDIST=		${WRKDIR}/gcc-${PKG_VERSION}
 
 include ../rules.mk
 
+GCJ_ENV+=		ac_cv_prog_JAR=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar
+GCJ_ENV+=		JAR=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar
+
 install: ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj
 
 $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
 	(cd $(WRKBUILD); \
 		wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-latest.jar; \
-		export ac_cv_prog_JAR=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar; \
-		export JAR=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar; \
-		./configure \
+		env ${GCJ_ENV} ./configure \
 			--prefix=/usr \
 			--enable-java-home \
 			--enable-languages=java \
@@ -40,11 +41,12 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
 	touch $@
 
 $(WRKBUILD)/.compiled: ${WRKDIST}/.configured
-	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
+	env ${GCJ_ENV} ${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
 	touch $@
 
 ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj: $(WRKBUILD)/.compiled
 	$(INSTALL_DIR) ${STAGING_JAVA_HOST_DIR}
-	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
+	env ${GCJ_ENV} ${MAKE} -C ${WRKBUILD} \
+	    DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
 
 include $(TOPDIR)/mk/tools.mk
-- 
cgit v1.2.3


From a6d93f95b95369531b703146842373cf575ed9f3 Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 2 Apr 2011 17:40:56 +0000
Subject: =?UTF-8?q?apparently,=20fastjar=20is=20also=20broken=20=E2=87=92?=
 =?UTF-8?q?=20use=20zip/unzip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 jtools/gcj/Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'jtools')

diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile
index 0c29e3124..ea41ca671 100644
--- a/jtools/gcj/Makefile
+++ b/jtools/gcj/Makefile
@@ -14,8 +14,7 @@ WRKDIST=		${WRKDIR}/gcc-${PKG_VERSION}
 
 include ../rules.mk
 
-GCJ_ENV+=		ac_cv_prog_JAR=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar
-GCJ_ENV+=		JAR=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar
+GCJ_ENV+=		JAR=no
 
 install: ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj
 
@@ -30,7 +29,6 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
 			--with-mpc=$(STAGING_HOST_DIR) \
 			--with-mpfr=$(STAGING_HOST_DIR) \
 			--with-gmp=$(STAGING_HOST_DIR) \
-			--with-jar=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar \
 			--disable-libmudflap \
 			--disable-libgomp \
 			--disable-biarch \
-- 
cgit v1.2.3


From 7f60e6cf0e0bf73ffd396f7198627c8922d4865b Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 2 Apr 2011 19:55:04 +0000
Subject: fix ecj build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• -Bsymbolic is only for GNU ld on ELF creating DLLs,
  not for Apple ld on Mach-O creating binaries
• /usr/lib64 doesn’t exist on some OSes, I might have heard…
• indent

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 jtools/ecj/Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'jtools')

diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile
index ffa6cd43e..e87354132 100644
--- a/jtools/ecj/Makefile
+++ b/jtools/ecj/Makefile
@@ -13,10 +13,12 @@ include ../rules.mk
 install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
 
 ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj:
-	env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
-	PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$$PATH \
-	$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -O2 -Wl,-Bsymbolic -findirect-dispatch \
-		-o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj --main=org.eclipse.jdt.internal.compiler.batch.Main \
+	env \
+		LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
+		PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$$PATH \
+	$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -O2 -findirect-dispatch \
+		-o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj \
+		--main=org.eclipse.jdt.internal.compiler.batch.Main \
 		$(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar
 	$(CP) $(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar ${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar
 
-- 
cgit v1.2.3


From afc6a2ce6bfdb25f47a0303f94c872aadbbb7e8c Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 2 Apr 2011 20:53:19 +0000
Subject: help gcj/ecj both to find their dylibs on Mac as well as others

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 jtools/ecj/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'jtools')

diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile
index e87354132..32cfdeb53 100644
--- a/jtools/ecj/Makefile
+++ b/jtools/ecj/Makefile
@@ -14,6 +14,7 @@ install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
 
 ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj:
 	env \
+		DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
 		LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
 		PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$$PATH \
 	$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -O2 -findirect-dispatch \
-- 
cgit v1.2.3


From f2cf68a6765c7f2d7442ccdba1c9e9db114828e5 Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 2 Apr 2011 21:02:18 +0000
Subject: disable gjdoc to make classpath build

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 jtools/classpath/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'jtools')

diff --git a/jtools/classpath/Makefile b/jtools/classpath/Makefile
index 253f9604d..e165c4d1c 100644
--- a/jtools/classpath/Makefile
+++ b/jtools/classpath/Makefile
@@ -23,6 +23,7 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
 		--disable-dssi \
 		--disable-plugin \
 		--disable-examples \
+		--disable-gjdoc \
 		--disable-Werror)
 	touch $@
 
-- 
cgit v1.2.3


From 4fd507e900d3741e6981a853de91944c43c59a0a Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 2 Apr 2011 21:03:06 +0000
Subject: =?UTF-8?q?make=20jamvm=20build=20on=20the=20Macintosh=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… where uname -p = i386 even on a system that is 64-bit

Apple #FAIL

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 jtools/jamvm/Makefile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'jtools')

diff --git a/jtools/jamvm/Makefile b/jtools/jamvm/Makefile
index f02450fb0..639b7d875 100644
--- a/jtools/jamvm/Makefile
+++ b/jtools/jamvm/Makefile
@@ -9,12 +9,22 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
 
+ifeq (Darwin,${OStype})
+CC_FOR_BUILD:=${CC_FOR_BUILD} -m32
+CXX_FOR_BUILD:=${CXX_FOR_BUILD} -m32
+endif
+
 include ../rules.mk
 
 install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm
 
 $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
-	(cd $(WRKBUILD); ./configure --prefix=/usr --with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR) );
+	cd $(WRKBUILD); env \
+		CC='${CC_FOR_BUILD}' \
+		CXX='${CXX_FOR_BUILD}' \
+	    ./configure \
+		--prefix=/usr \
+		--with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR)
 	touch $@
 
 $(WRKBUILD)/.compiled: ${WRKDIST}/.configured
-- 
cgit v1.2.3


From d76426c353f096f1312c4df605b1d6d855171192 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 3 Apr 2011 00:47:14 +0200
Subject: =?UTF-8?q?more=20steps=20toward=20an=20IcedTea=20(or=20so=20we=20?=
 =?UTF-8?q?hope),=20still=20fails,=20though=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jtools/classpath/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'jtools')

diff --git a/jtools/classpath/Makefile b/jtools/classpath/Makefile
index e165c4d1c..d4421bf9a 100644
--- a/jtools/classpath/Makefile
+++ b/jtools/classpath/Makefile
@@ -24,6 +24,7 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
 		--disable-plugin \
 		--disable-examples \
 		--disable-gjdoc \
+		--with-jar=no \
 		--disable-Werror)
 	touch $@
 
-- 
cgit v1.2.3


From 8a75e236880e3c426edd1af19a052fae3e1fd270 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 3 Apr 2011 17:44:46 +0200
Subject: merge some changes, cosmetic fixes

---
 jtools/cacao/Makefile | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'jtools')

diff --git a/jtools/cacao/Makefile b/jtools/cacao/Makefile
index 6d4b76d1f..7b5262dcc 100644
--- a/jtools/cacao/Makefile
+++ b/jtools/cacao/Makefile
@@ -7,29 +7,28 @@ PKG_NAME:=		cacao
 PKG_VERSION:=		0.99.4
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
-PKG_SITES:=		http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/
+PKG_SITES:=		http://www.complang.tuwien.ac.at/cacaojvm/download/$(PKG_NAME)-$(PKG_VERSION)/
 
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
 include ../rules.mk
 
-install: ${STAGING_HOST_DIR}/usr/bin/cacao
+install: ${STAGING_JAVA_HOST_DIR}/usr/bin/cacao
 
 $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
-	(cd $(WRKBUILD); ./configure --prefix=/usr --disable-libjvm --enable-debug \
-		--with-vm-zip=$(STAGING_HOST_DIR)/usr/share/cacao/vm.zip \
+	cd $(WRKBUILD); ./configure --prefix=/usr --disable-libjvm --enable-debug \
+		--with-vm-zip=$(STAGING_JAVA_HOST_DIR)/usr/share/cacao/vm.zip \
 		--with-java-runtime-library=gnuclasspath \
-		--with-java-runtime-library-classes=$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip \
-		--with-java-runtime-library-prefix=$(STAGING_HOST_DIR)/usr \
-		--with-jni_md_h=$(STAGING_HOST_DIR)/usr/include \
-	);
+		--with-java-runtime-library-classes=$(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip \
+		--with-java-runtime-library-prefix=$(STAGING_JAVA_HOST_DIR)/usr \
+		--with-jni_md_h=$(STAGING_JAVA_HOST_DIR)/usr/include \
 	touch $@
 
 $(WRKBUILD)/.compiled: ${WRKDIST}/.configured
 	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
 	touch $@
 
-${STAGING_HOST_DIR}/usr/bin/cacao: $(WRKBUILD)/.compiled
-	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_HOST_DIR) install $(MAKE_TRACE)
+${STAGING_JAVA_HOST_DIR}/usr/bin/cacao: $(WRKBUILD)/.compiled
+	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
 
 include $(TOPDIR)/mk/tools.mk
-- 
cgit v1.2.3


From ecf189dbe827549ea7e12f939cc410f5996b3d2b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 4 Apr 2011 17:33:11 +0200
Subject: first bootstrap compiler successfully works.

the AWT requires all the X11 and graphic libraries.
Jamvm is not required, we can just use gij from gcj.
---
 jtools/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'jtools')

diff --git a/jtools/Makefile b/jtools/Makefile
index 932cd298f..23c90534f 100644
--- a/jtools/Makefile
+++ b/jtools/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 TARGETS:=
 ifneq ($(ADK_PACKAGE_OPENJDK),)
-TARGETS+=fastjar gcj classpath jamvm ecj
+TARGETS+=fastjar gcj classpath ecj
 endif
 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
-- 
cgit v1.2.3


From 54302bd22cbdda4cabf0541cabfb7c3373a92356 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 4 Apr 2011 19:44:06 +0200
Subject: get all prerequisites for openjdk (cross-compile) right

---
 jtools/cacao/Makefile | 34 ----------------------------------
 jtools/jamvm/Makefile | 37 -------------------------------------
 2 files changed, 71 deletions(-)
 delete mode 100644 jtools/cacao/Makefile
 delete mode 100644 jtools/jamvm/Makefile

(limited to 'jtools')

diff --git a/jtools/cacao/Makefile b/jtools/cacao/Makefile
deleted file mode 100644
index 7b5262dcc..000000000
--- a/jtools/cacao/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=		cacao
-PKG_VERSION:=		0.99.4
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
-PKG_SITES:=		http://www.complang.tuwien.ac.at/cacaojvm/download/$(PKG_NAME)-$(PKG_VERSION)/
-
-DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-
-include ../rules.mk
-
-install: ${STAGING_JAVA_HOST_DIR}/usr/bin/cacao
-
-$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
-	cd $(WRKBUILD); ./configure --prefix=/usr --disable-libjvm --enable-debug \
-		--with-vm-zip=$(STAGING_JAVA_HOST_DIR)/usr/share/cacao/vm.zip \
-		--with-java-runtime-library=gnuclasspath \
-		--with-java-runtime-library-classes=$(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip \
-		--with-java-runtime-library-prefix=$(STAGING_JAVA_HOST_DIR)/usr \
-		--with-jni_md_h=$(STAGING_JAVA_HOST_DIR)/usr/include \
-	touch $@
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
-	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
-	touch $@
-
-${STAGING_JAVA_HOST_DIR}/usr/bin/cacao: $(WRKBUILD)/.compiled
-	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
-
-include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/jamvm/Makefile b/jtools/jamvm/Makefile
deleted file mode 100644
index 639b7d875..000000000
--- a/jtools/jamvm/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=		jamvm
-PKG_VERSION:=		1.5.4
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
-
-ifeq (Darwin,${OStype})
-CC_FOR_BUILD:=${CC_FOR_BUILD} -m32
-CXX_FOR_BUILD:=${CXX_FOR_BUILD} -m32
-endif
-
-include ../rules.mk
-
-install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm
-
-$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
-	cd $(WRKBUILD); env \
-		CC='${CC_FOR_BUILD}' \
-		CXX='${CXX_FOR_BUILD}' \
-	    ./configure \
-		--prefix=/usr \
-		--with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR)
-	touch $@
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
-	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
-	touch $@
-
-${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm: $(WRKBUILD)/.compiled
-	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
-
-include $(TOPDIR)/mk/tools.mk
-- 
cgit v1.2.3


From 7356a92fbf59f66521b2e7fdd478b0fa63df052d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 6 Apr 2011 14:25:15 +0200
Subject: add wrappers for ecj and gij, allow to start openjdk bootstrap target
 jdk compile

---
 jtools/ecj/Makefile | 9 ++++++++-
 jtools/gcj/Makefile | 6 +++---
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'jtools')

diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile
index 32cfdeb53..a67e9ebd8 100644
--- a/jtools/ecj/Makefile
+++ b/jtools/ecj/Makefile
@@ -18,9 +18,16 @@ ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj:
 		LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
 		PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$$PATH \
 	$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -O2 -findirect-dispatch \
-		-o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj \
+		-o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj.native \
 		--main=org.eclipse.jdt.internal.compiler.batch.Main \
 		$(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar
 	$(CP) $(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar ${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar
+	echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj.native \$$@" > \
+		${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
+	chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
+	# put a wrapper for java here
+	echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/gij \$$@" > \
+		${STAGING_JAVA_HOST_DIR}/usr/bin/java
+	chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/java
 
 include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile
index ea41ca671..7ccd03c15 100644
--- a/jtools/gcj/Makefile
+++ b/jtools/gcj/Makefile
@@ -26,9 +26,9 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
 			--enable-java-home \
 			--enable-languages=java \
 			--with-ffi \
-			--with-mpc=$(STAGING_HOST_DIR) \
-			--with-mpfr=$(STAGING_HOST_DIR) \
-			--with-gmp=$(STAGING_HOST_DIR) \
+			--with-mpc=$(STAGING_HOST_DIR)/usr \
+			--with-mpfr=$(STAGING_HOST_DIR)/usr \
+			--with-gmp=$(STAGING_HOST_DIR)/usr \
 			--disable-libmudflap \
 			--disable-libgomp \
 			--disable-biarch \
-- 
cgit v1.2.3