diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-09 13:32:18 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-09 13:32:18 +0100 |
| commit | 23bc64ab05f3f152903c127d0bd24de681dc2044 (patch) | |
| tree | 1e6afda7a75dc0b4d309a3a97d55d2bf609bb2d3 /jtools | |
| parent | 442ae3a70f492fb16440ca081309638de0a6bd1b (diff) | |
disable some stuff for bulk builds
Diffstat (limited to 'jtools')
| -rw-r--r-- | jtools/ant/Makefile | 2 | ||||
| -rw-r--r-- | jtools/files.needed | 1 | ||||
| -rw-r--r-- | jtools/gcj/Makefile | 4 | ||||
| -rw-r--r-- | jtools/jamvm/Makefile | 7 | ||||
| -rw-r--r-- | jtools/jikes/Makefile | 2 | ||||
| -rw-r--r-- | jtools/openjdk/Makefile | 4 |
6 files changed, 9 insertions, 11 deletions
diff --git a/jtools/ant/Makefile b/jtools/ant/Makefile index 537668a21..06a7f750c 100644 --- a/jtools/ant/Makefile +++ b/jtools/ant/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= ant PKG_VERSION:= 1.8.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 63220327925ace13756ae334c55a3baa +PKG_MD5SUM:= 0d9e108afcd15b820150b8085c96d2b1 PKG_SITES:= http://www.apache.org/dist/ant/source/ DISTFILES:= apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2 diff --git a/jtools/files.needed b/jtools/files.needed index 055a359fc..c6a1de4ba 100644 --- a/jtools/files.needed +++ b/jtools/files.needed @@ -9,4 +9,3 @@ XTest.h;libXtst freetype.h;freetype asoundlib.h;libasound ffi.h;libffi -Xproto.h;libXp diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile index 45302e723..429574c7c 100644 --- a/jtools/gcj/Makefile +++ b/jtools/gcj/Makefile @@ -13,7 +13,7 @@ DISTFILES:= gcc-$(PKG_VERSION).tar.bz2 WRKDIST= ${WRKDIR}/gcc-${PKG_VERSION} include ../rules.mk -GCJ_ENV+= JAR=no +GCJ_ENV+= "JAR=no LDFLAGS=-liconv" install: ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj @@ -29,6 +29,8 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared --with-mpc=$(STAGING_HOST_DIR) \ --with-mpfr=$(STAGING_HOST_DIR) \ --with-gmp=$(STAGING_HOST_DIR) \ + --disable-nls \ + --without-libiconv-prefix \ --disable-libmudflap \ --disable-libgomp \ --disable-biarch \ diff --git a/jtools/jamvm/Makefile b/jtools/jamvm/Makefile index a85b2d6c8..1775ff5aa 100644 --- a/jtools/jamvm/Makefile +++ b/jtools/jamvm/Makefile @@ -6,14 +6,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= jamvm PKG_VERSION:= 1.5.4 PKG_RELEASE:= 2 -PKG_MD5SUM:= 63220327925ace13756ae334c55a3baa +PKG_MD5SUM:= 7654e9657691f5f09c4f481ed4686176 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 diff --git a/jtools/jikes/Makefile b/jtools/jikes/Makefile index c26a0f45b..1d619c8eb 100644 --- a/jtools/jikes/Makefile +++ b/jtools/jikes/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= jikes PKG_VERSION:= 1.22 PKG_RELEASE:= 1 -PKG_MD5SUM:= 14d4bdfac236e347d806c6743dba48c6 +PKG_MD5SUM:= cda958c7fef6b43b803e1d1ef9afcb85 PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/} DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/jtools/openjdk/Makefile b/jtools/openjdk/Makefile index 12426a8d2..600db055b 100644 --- a/jtools/openjdk/Makefile +++ b/jtools/openjdk/Makefile @@ -59,7 +59,9 @@ $(WRKDIST)/.extract: $(WRKDIST)/.extract_done cd ${WRKDIST}; tar xzf ${TOPDIR}/dl/${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz mkdir -p ${WRKBUILD}/drops cd ${TOPDIR}/dl; cp jaxp144_01.zip jdk6-jaf-b20.zip jdk6-jaxws-b20.zip ${WRKBUILD}/drops - cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/*.patch + cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/openjdk.patch + cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/iconv.patch + cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/remove-libnsl.patch touch $@ $(WRKDIST)/.configured: ${WRKDIST}/.extract |