From 2548d641ca7adfe3dcf31d09bb2f9b047b186a0f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 23 Jan 2014 08:12:50 +0100 Subject: remove jtools/java host dir. use host stuff instead. fix arm building. --- package/openjdk7/Makefile | 56 +++++++++++++++++++++++++--- package/openjdk7/patches/openadk.patch | 67 ++++++++++++++++++++++++++++++---- 2 files changed, 111 insertions(+), 12 deletions(-) (limited to 'package/openjdk7') diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index ed4fc21b4..292ae8553 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -10,6 +10,10 @@ PKG_MD5SUM:= 9b3afa162021e3fca6161ba8f9f7dc11 PKG_DESCR:= OpenJDK 7 Java VM PKG_SECTION:= lang PKG_BUILDDEP:= gettext-tiny-host glib-host flex-host bison-host qemu-host +PKG_BUILDDEP+= fastjar-host libICE-host libSM-host libX11-host util-macros-host libXt-host +PKG_BUILDDEP+= xineramaproto-host libXinerama-host libXtst-host freetype-host +PKG_BUILDDEP+= alsa-lib-host libffi-host gcj-host ecj-host jikes-host +PKG_BUILDDEP+= classpath-host jamvm-host ant-host openjdk7-host PKG_BUILDDEP+= alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups PKG_BUILDDEP+= libX11 libXt libXp libXinerama libXrender libXtst libiconv-tiny PKG_DEPENDS:= zlib libstdcxx libffi libpthread libxtst libxi libgcc @@ -19,6 +23,8 @@ PKG_SITES:= http://icedtea.classpath.org/download/source/ DISTFILES:= icedtea-$(PKG_VERSION).tar.gz WRKDIST= ${WRKDIR}/icedtea-${PKG_VERSION} +GCJ_VER:= 4.7.3 + PKG_HOST_DEPENDS:= linux PKG_ARCH_DEPENDS:= arm mips ppc sparc x86 x86_64 PKG_SYSTEM_DEPENDS:= !linksys-ag241 !fon-fon2100 !broadcom-bcm47xx !lemote-yeelong @@ -30,9 +36,11 @@ PKGCD_SHARK:= Shark JIT backend (needs eglibc/glibc) PKGCB_SHARK:= llvm PKGCD_CACAO:= Cacao JIT backend +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk include $(TOPDIR)/mk/qemu.mk +$(eval $(call HOST_template,OPENJDK7,openjdk7,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,OPENJDK7,openjdk7,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) # for UINTPTR_MAX in stdint.h @@ -41,7 +49,7 @@ TARGET_CFLAGS+= -D__STDC_LIMIT_MACROS TARGET_CFLAGS:= $(subst march=pentium-m,march=i686,$(TARGET_CFLAGS)) TARGET_CFLAGS:= $(subst march=atom,march=i686,$(TARGET_CFLAGS)) TARGET_CFLAGS:= $(filter-out -fhonour-copts,$(TARGET_CFLAGS)) -BOOTSTRAPJDK:= ${STAGING_JAVA_HOST_DIR}/bootstrap-jdk +BOOTSTRAPJDK:= ${STAGING_HOST_DIR}/bootstrap-jdk JDKARCH:= $(CPU_ARCH) ifeq ($(ARCH),x86) @@ -70,12 +78,11 @@ CONFIGURE_COMMON:= --disable-docs \ --with-jar=$(BOOTSTRAPJDK)/bin/jar \ --with-rmic=$(BOOTSTRAPJDK)/bin/rmic \ --with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \ - --with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \ + --with-gcj=$(STAGING_HOST_DIR)/usr/bin/gcj \ --without-hotspot-build \ --disable-system-jpeg \ --disable-system-lcms \ --disable-system-zlib \ - --disable-system-kerberos \ --disable-system-png \ --disable-system-gif \ --disable-system-gtk \ @@ -88,17 +95,55 @@ CONFIGURE_ARGS+= $(CONFIGURE_BACKEND) CONFIGURE_ARGS+= $(CONFIGURE_COMMON) CONFIGURE_ARGS+= --disable-bootstrap -CONFIGURE_ENV+= PATH="$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}" +CONFIGURE_ENV+= LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \ ALT_OPENWIN_HOME=$(STAGING_DIR)/usr/ \ ALT_CUPS_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \ ALT_FREETYPE_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \ OTHER_CFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \ OTHER_CXXFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \ - GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(JDKARCH) QEMU=$(QEMU) + OTHER_LDFLAGS='$(TARGET_LDFLAGS)' \ + GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(JDKARCH) QEMU=$(QEMU) \ + LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib ALL_TARGET:= icedtea +# host stuff +OPENJDK_NATIVE_ENV+= JAVACFLAGS="-cp ${STAGING_HOST_DIR}/usr/share/java/libgcj-$(GCJ_VER).jar" +OPENJDK_NATIVE_ENV+= LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 +OPENJDK_NATIVE_ENV+= ADK_ECJ=$(STAGING_HOST_DIR)/usr/bin/ecj +OPENJDK_NATIVE_ENV+= BOOTCLASSPATH="$(STAGING_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip" +OPENJDK_NATIVE_ENV+= FFI_LDFLAGS="$(LDFLAGS_FOR_BUILD)" + +HOST_STYLE:= auto +HOST_CONFIGURE_ENV+= $(OPENJDK_NATIVE_ENV) +HOST_MAKE_ENV+= $(OPENJDK_NATIVE_ENV) +HOST_ALL_TARGET:= icedtea-boot + +HOST_CONFIGURE_ARGS+=\ + --enable-bootstrap \ + --enable-zero \ + --with-jdk-home=$(STAGING_HOST_DIR)/usr/lib/jvm \ + --with-java=$(STAGING_HOST_DIR)/usr/bin/java \ + --with-javac=$(STAGING_HOST_DIR)/usr/bin/ecj \ + --with-ecj-jar=${STAGING_HOST_DIR}/usr/share/java/ecj.jar \ + --without-hotspot-build \ + --disable-system-jpeg \ + --disable-system-lcms \ + --disable-system-zlib \ + --disable-system-png \ + --disable-system-gif \ + --disable-system-gtk \ + --disable-system-gio \ + --disable-system-fontconfig \ + --disable-compile-against-syscalls \ + --without-rhino \ + --disable-docs + +hostpost-install: + -rm -rf $(STAGING_HOST_DIR)/bootstrap-jdk + $(CP) $(WRKBUILD)/openjdk.build-boot/j2sdk-image $(STAGING_HOST_DIR)/bootstrap-jdk + openjdk7-install: $(INSTALL_DIR) $(IDIR_OPENJDK7)/usr/lib/jvm/jre $(INSTALL_DIR) $(IDIR_OPENJDK7)/usr/bin @@ -107,4 +152,5 @@ openjdk7-install: (cd $(IDIR_OPENJDK7)/usr/bin && ln -sf ../lib/jvm/jre/bin/java .) (cd $(IDIR_OPENJDK7)/usr/lib/jvm/jre/lib/$(JDKARCH) && ln -sf server/libjvm.so .) +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/openjdk7/patches/openadk.patch b/package/openjdk7/patches/openadk.patch index effd32a92..75e291e47 100644 --- a/package/openjdk7/patches/openadk.patch +++ b/package/openjdk7/patches/openadk.patch @@ -1,6 +1,6 @@ -diff -Nur icedtea-2.3.11.orig/Makefile.in icedtea-2.3.11/Makefile.in ---- icedtea-2.3.11.orig/Makefile.in 2013-07-25 02:39:55.000000000 +0200 -+++ icedtea-2.3.11/Makefile.in 2013-12-08 15:43:27.000000000 +0100 +diff -Nur icedtea-2.3.12.orig/Makefile.in icedtea-2.3.12/Makefile.in +--- icedtea-2.3.12.orig/Makefile.in 2013-07-26 20:18:01.000000000 +0200 ++++ icedtea-2.3.12/Makefile.in 2014-01-16 08:54:53.000000000 +0100 @@ -695,7 +695,7 @@ $(DISTRIBUTION_PATCHES) @@ -19,10 +19,10 @@ diff -Nur icedtea-2.3.11.orig/Makefile.in icedtea-2.3.11/Makefile.in @BUILD_NATIVE_ECJ_TRUE@ --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} touch $@ -diff -Nur icedtea-2.3.11.orig/patches/openadk.patch icedtea-2.3.11/patches/openadk.patch ---- icedtea-2.3.11.orig/patches/openadk.patch 1970-01-01 01:00:00.000000000 +0100 -+++ icedtea-2.3.11/patches/openadk.patch 2013-12-08 16:22:41.000000000 +0100 -@@ -0,0 +1,493 @@ +diff -Nur icedtea-2.3.12.orig/patches/openadk.patch icedtea-2.3.12/patches/openadk.patch +--- icedtea-2.3.12.orig/patches/openadk.patch 1970-01-01 01:00:00.000000000 +0100 ++++ icedtea-2.3.12/patches/openadk.patch 2014-01-16 08:55:05.000000000 +0100 +@@ -0,0 +1,546 @@ +diff -Nur openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp +--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2013-07-17 20:14:46.000000000 +0200 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2013-12-08 15:44:03.000000000 +0100 @@ -516,3 +516,56 @@ diff -Nur icedtea-2.3.11.orig/patches/openadk.patch icedtea-2.3.11/patches/opena + + ifndef JDK_TOPDIR + JDK_TOPDIR=$(TOPDIR)/jdk ++diff -Nur openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make openjdk-boot/hotspot/make/linux/makefiles/vm.make ++--- openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make 2013-07-26 12:31:42.000000000 +0200 +++++ openjdk-boot/hotspot/make/linux/makefiles/vm.make 2014-01-14 21:28:27.000000000 +0100 ++@@ -285,7 +285,7 @@ ++ LIBS_VM += $(LIBS) ++ endif ++ ifeq ($(ZERO_BUILD), true) ++- LIBS_VM += $(LIBFFI_LIBS) +++ LIBS_VM += $(FFI_LDFLAGS) -Wl,-Bstatic $(LIBFFI_LIBS) -Wl,-Bdynamic ++ endif ++ ifeq ($(SHARK_BUILD), true) ++ LFLAGS_VM += $(LLVM_LDFLAGS) ++diff -Nur openjdk-boot.orig/Makefile openjdk-boot/Makefile ++--- openjdk-boot.orig/Makefile 2013-07-24 23:26:43.000000000 +0200 +++++ openjdk-boot/Makefile 2014-01-13 22:15:04.000000000 +0100 ++@@ -53,9 +53,7 @@ ++ REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME) ++ REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME) ++ ++-ifndef TOPDIR ++- TOPDIR:=. ++-endif +++TOPDIR:=. ++ ++ ifndef JDK_TOPDIR ++ JDK_TOPDIR=$(TOPDIR)/jdk ++diff -Nur openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make ++--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make 2013-07-26 12:31:42.000000000 +0200 +++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make 2014-01-16 08:45:53.000000000 +0100 ++@@ -38,7 +38,7 @@ ++ ++ offsets_arm.s: mkoffsets ++ @echo Generating assembler offsets ++- ./mkoffsets > $@ +++ $(QEMU) ./mkoffsets > $@ ++ ++ bytecodes_arm.s: bytecodes_arm.def mkbc ++ @echo Generating ARM assembler bytecode sequences ++@@ -46,12 +46,12 @@ ++ ++ mkbc: $(GAMMADIR)/tools/mkbc.c ++ @echo Compiling mkbc tool ++- $(CC_COMPILE) -o $@ $< $(COMPILE_DONE) +++ $(CC_FOR_BUILD) -o $@ $< $(COMPILE_DONE) ++ ++ mkoffsets: asm_helper.cpp ++ @echo Compiling offset generator ++ $(QUIETLY) $(REMOVE_TARGET) ++- $(CC_COMPILE) $(CFLAGS) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) +++ $(CC_COMPILE) $(CFLAGS) -static -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) ++ ++ endif ++ -- cgit v1.2.3