diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-29 18:03:16 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-29 18:03:16 +0200 |
| commit | f29727933598eacd5e193bd62b5807cd7f945480 (patch) | |
| tree | baeac5a788882c914fca968a325d5ad653e61ec5 /package/openjdk | |
| parent | 633471975517358cf2f6663d7aad81e35358df56 (diff) | |
use llvm for shark
Diffstat (limited to 'package/openjdk')
| -rw-r--r-- | package/openjdk/Makefile | 4 | ||||
| -rw-r--r-- | package/openjdk/patches/disable-sizers.patch | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index 08d80e4c4..fb7e89be4 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -50,6 +50,7 @@ PKG_SUBPKGS:= OPENJDK PKG_CHOICES_OPENJDK:= ZERO SHARK CACAO PKGCD_ZERO:= zero-assembly backend PKGCD_SHARK:= JIT backend +PKGCB_SHARK:= llvm PKGCD_CACAO:= Cacao JIT backend PKGCD_JAMVM:= JamVM backend @@ -95,6 +96,7 @@ MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \ 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) \ + PATH=$${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) ALL_TARGET:= icedtea @@ -109,7 +111,7 @@ do-extract: pre-configure: cd ${WRKBUILD}; rm -rf config.{cache,status}; \ - export ${OPENJDK_NATIVE_ENV} $(MAKE_ENV) ; ./configure \ + export $(MAKE_ENV) ${OPENJDK_NATIVE_ENV} ; ./configure \ ${CONFIGURE_TRIPLE} \ $(CONFIGURE_BACKEND) \ --prefix=/usr \ diff --git a/package/openjdk/patches/disable-sizers.patch b/package/openjdk/patches/disable-sizers.patch index e69de29bb..46325008c 100644 --- a/package/openjdk/patches/disable-sizers.patch +++ b/package/openjdk/patches/disable-sizers.patch @@ -0,0 +1,12 @@ +--- w-openjdk-6.orig/openjdk-6/jdk/make/sun/xawt/Makefile 2011-02-28 17:06:12.000000000 +0100 ++++ w-openjdk-6/openjdk-6/jdk/make/sun/xawt/Makefile 2011-04-13 12:00:18.618922673 +0200 +@@ -237,7 +237,8 @@ + $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \ + $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@))) + +-$(SIZES): $(SIZERS) ++$(SIZES): ++ $(prep-target) + @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ + $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ + $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ |