From 1eccc1842e2c6a0bce4c448320341f1aef1683b7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 15 Aug 2011 12:12:44 +0200 Subject: cosmetic changes for jtools build --- package/openjdk/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/openjdk/Makefile') diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index 45194d4d9..0e5d4852c 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -50,7 +50,7 @@ WRKSRC= ${WRKDIST}/${ICEDTEA_NAME}-${ICEDTEA_VERSION} PKG_SUBPKGS:= OPENJDK PKG_CHOICES_OPENJDK:= ZERO SHARK CACAO PKGCD_ZERO:= zero-assembly backend -PKGCD_SHARK:= JIT backend +PKGCD_SHARK:= Shark JIT backend PKGCB_SHARK:= llvm PKGCD_CACAO:= Cacao JIT backend PKGCD_JAMVM:= JamVM backend -- cgit v1.2.3 From 36c4d46389c888b948448b34284af1d7dfd60508 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 15 Aug 2011 12:18:17 +0200 Subject: fix compile for arm target --- package/openjdk/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package/openjdk/Makefile') diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index 45194d4d9..2650341c5 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -26,6 +26,8 @@ PKG_SITES:= http://download.java.net/openjdk/jdk6/promoted/b22/ \ #PKG_CFLINE_OPENJDK:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC && !ADK_TARGET_SYSTEM_LEMOTE_YEELONG PKG_HOST_DEPENDS:= !darwin !cygwin !openbsd !netbsd !freebsd +PKG_ARCH_DEPENDS:= arm mips x86 x86_64 +PKG_SYSTEM_DEPENDS:= !lemote-yeelong !linksys-ag241 !fon-fon2100 # autotools infrastructure for OpenJDK ICEDTEA_NAME:= icedtea6 -- cgit v1.2.3 From 9637f7746433e32ce710f0094aee29eea994195f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 19 Aug 2011 18:11:35 +0200 Subject: more qemu archs for OpenJDK --- package/openjdk/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'package/openjdk/Makefile') diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index 62786add7..56097f6f8 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -52,7 +52,7 @@ WRKSRC= ${WRKDIST}/${ICEDTEA_NAME}-${ICEDTEA_VERSION} PKG_SUBPKGS:= OPENJDK PKG_CHOICES_OPENJDK:= ZERO SHARK CACAO PKGCD_ZERO:= zero-assembly backend -PKGCD_SHARK:= Shark JIT backend +PKGCD_SHARK:= Shark JIT backend (needs eglibc/glibc) PKGCB_SHARK:= llvm PKGCD_CACAO:= Cacao JIT backend PKGCD_JAMVM:= JamVM backend @@ -61,6 +61,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,OPENJDK,openjdk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + TARGET_CFLAGS:= $(filter-out -fhonour-copts,$(TARGET_CFLAGS)) BOOTSTRAPJDK:= ${STAGING_JAVA_HOST_DIR}/bootstrap-jdk @@ -110,6 +111,9 @@ ALL_TARGET:= icedtea # add include path for Xrender.h from staging directory post-patch: +ifeq ($(QEMU),) + $(error Fatal error: $$QEMU not set!) +endif $(SED) "s#@ADK_TARGETDIR@#$(STAGING_TARGET_DIR)#" ${WRKDIST}/$(PKG_NAME)-$(PKG_VERSION)/jdk/make/sun/xawt/Makefile do-extract: -- cgit v1.2.3 From b6fed3d8f011df89e166b673a2bbee6d7bdee734 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 19 Aug 2011 19:46:02 +0200 Subject: use native ecj, comment some patches --- package/openjdk/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package/openjdk/Makefile') diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index 56097f6f8..ad8f29778 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -99,11 +99,13 @@ CONFIGURE_ARGS+= --disable-docs \ CONFIGURE_ENV+= PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \ + ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \ PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin \ GCC_HONOUR_COPTS=s \ TARGET_ALIAS=$(GNU_TARGET_NAME) BUILD_ALIAS=$(GNU_HOST_NAME) HOST_ALIAS=$(GNU_TARGET_NAME) OPENJDK_NATIVE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \ + ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \ PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin \ GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(ARCH) \ TARGET_ALIAS=$(GNU_TARGET_NAME) BUILD_ALIAS=$(GNU_HOST_NAME) HOST_ALIAS=$(GNU_TARGET_NAME) -- cgit v1.2.3 From 432ae1a94f4d543da3aa2ed226cd3c00e350e3c4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 21 Aug 2011 10:28:27 +0200 Subject: use qemu to execute sizer binary, remove pregenerated stuff --- package/openjdk/Makefile | 4 ---- 1 file changed, 4 deletions(-) (limited to 'package/openjdk/Makefile') diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index ad8f29778..1f8264f67 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -154,10 +154,6 @@ pre-configure: --with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \ --with-ecj-jar=$(STAGING_JAVA_HOST_DIR)/usr/share/java/ecj.jar \ --without-rhino ;\ - mkdir -p $(WRKBUILD)/generated/sun/awt/X11/generator/ ; \ - mkdir -p $(WRKBUILD)/openjdk.build/gensrc/sun/awt/X11/generator/ ; \ - cp $(TOPDIR)/jtools/openjdk/files/sizes.* $(WRKBUILD)/generated/sun/awt/X11/generator/; \ - cp $(TOPDIR)/jtools/openjdk/files/sizes.* $(WRKBUILD)/openjdk.build/gensrc/sun/awt/X11/generator/; \ env ${OPENJDK_NATIVE_ENV} $(MAKE) icedtea-ecj # fixup symlinks to bootstrap jdk ln -sf $(BOOTSTRAPJDK)/bin/java $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/java -- cgit v1.2.3