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/gcj/Makefile') 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/gcj/Makefile') 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/gcj/Makefile') 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/gcj/Makefile') 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