From 10a925546005b9fdce4e660d62004782a0067461 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser 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 --- 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 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 --- 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 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 --- 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 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 --- 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 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 --- 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 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 --- 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 Date: Sat, 2 Apr 2011 21:02:18 +0000 Subject: disable gjdoc to make classpath build Signed-off-by: Thorsten Glaser --- 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 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 --- 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 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 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