diff options
Diffstat (limited to 'jtools')
| -rw-r--r-- | jtools/classpath/Makefile | 2 | ||||
| -rw-r--r-- | jtools/ecj/Makefile | 11 | ||||
| -rw-r--r-- | jtools/gcj/Makefile | 25 | ||||
| -rw-r--r-- | jtools/jamvm/Makefile | 12 |
4 files changed, 37 insertions, 13 deletions
diff --git a/jtools/classpath/Makefile b/jtools/classpath/Makefile index 253f9604d..d4421bf9a 100644 --- a/jtools/classpath/Makefile +++ b/jtools/classpath/Makefile @@ -23,6 +23,8 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared --disable-dssi \ --disable-plugin \ --disable-examples \ + --disable-gjdoc \ + --with-jar=no \ --disable-Werror) touch $@ diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile index ffa6cd43e..32cfdeb53 100644 --- a/jtools/ecj/Makefile +++ b/jtools/ecj/Makefile @@ -13,10 +13,13 @@ 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 \ + 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 \ + -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 diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile index ba31c27ea..ea41ca671 100644 --- a/jtools/gcj/Makefile +++ b/jtools/gcj/Makefile @@ -14,28 +14,37 @@ WRKDIST= ${WRKDIR}/gcc-${PKG_VERSION} include ../rules.mk +GCJ_ENV+= JAR=no + 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) \ + env ${GCJ_ENV} ./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 \ + --disable-libgomp \ + --disable-biarch \ + --disable-decimal-float \ + --disable-multilib \ + --disable-bootstrap \ ); 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 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 |