diff options
Diffstat (limited to 'jtools/openjdk7')
| -rw-r--r-- | jtools/openjdk7/Makefile | 58 | ||||
| -rw-r--r-- | jtools/openjdk7/patches/openadk.patch | 39 |
2 files changed, 0 insertions, 97 deletions
diff --git a/jtools/openjdk7/Makefile b/jtools/openjdk7/Makefile deleted file mode 100644 index 58db553fe..000000000 --- a/jtools/openjdk7/Makefile +++ /dev/null @@ -1,58 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(TOPDIR)/rules.mk - -PKG_NAME:= icedtea -PKG_VERSION:= 2.3.12 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 9b3afa162021e3fca6161ba8f9f7dc11 -PKG_DESCR:= OpenJDK 7 Java VM -PKG_SECTION:= lang -PKG_URL:= http://openjdk.org/ -PKG_SITES:= http://icedtea.classpath.org/download/source/ - -include ../rules.mk - -OPENJDK_NATIVE_ENV+= JAVACFLAGS="-cp ${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-$(GCJ_VER).jar" -OPENJDK_NATIVE_ENV+= DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 -OPENJDK_NATIVE_ENV+= LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 -OPENJDK_NATIVE_ENV+= ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj PATH=$$PATH:$(STAGING_JAVA_HOST_DIR)/usr/bin -OPENJDK_NATIVE_ENV+= BOOTCLASSPATH="$(STAGING_JAVA_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip" - -install: ${STAGING_JAVA_HOST_DIR}/bootstrap-jdk/bin/java - -CONFIGURE_ARGS+=\ - --enable-bootstrap \ - --enable-zero \ - --with-jdk-home=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm \ - --with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/java \ - --with-javac=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \ - --with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/java/ecj.jar \ - --without-hotspot-build \ - --disable-system-kerberos \ - --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 - -$(WRKDIST)/.configured: ${WRKDIST}/.prepared - (cd ${WRKBUILD}; export ${OPENJDK_NATIVE_ENV}; ./configure ${CONFIGURE_ARGS}) - touch $@ - -$(WRKBUILD)/.compiled: ${WRKDIST}/.configured - export ${OPENJDK_NATIVE_ENV}; $(MAKE) -C $(WRKBUILD) icedtea-boot - touch $@ - -${STAGING_JAVA_HOST_DIR}/bootstrap-jdk/bin/java: $(WRKBUILD)/.compiled - $(CP) $(WRKSRC)/openjdk.build-boot/j2sdk-image $(STAGING_JAVA_HOST_DIR)/bootstrap-jdk - touch $@ - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/jtools/openjdk7/patches/openadk.patch b/jtools/openjdk7/patches/openadk.patch deleted file mode 100644 index 11eb2aea6..000000000 --- a/jtools/openjdk7/patches/openadk.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Nur icedtea-2.3.4.orig/Makefile.in icedtea-2.3.4/Makefile.in ---- icedtea-2.3.4.orig/Makefile.in 2013-01-15 10:44:02.000000000 +0100 -+++ icedtea-2.3.4/Makefile.in 2013-02-11 17:32:45.000000000 +0100 -@@ -640,7 +640,7 @@ - $(am__append_14) $(am__append_15) $(DISTRIBUTION_PATCHES) - - # Bootstrapping patches --ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \ -+ICEDTEA_BOOT_PATCHES = patches/topdir-openwrt.patch patches/boot/javafiles.patch \ - patches/boot/ant-javac.patch patches/boot/corba-idlj.patch \ - patches/boot/corba-no-gen.patch patches/boot/corba-orb.patch \ - patches/boot/demos.patch patches/boot/ecj-fphexconstants.patch \ -@@ -2033,7 +2033,7 @@ - # Optional native ecj - stamps/native-ecj.stamp: - mkdir -p stamps --@BUILD_NATIVE_ECJ_TRUE@ ${GCJ} $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \ -+@BUILD_NATIVE_ECJ_TRUE@ ${GCJ} -lgcj $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \ - @BUILD_NATIVE_ECJ_TRUE@ --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} - touch $@ - -diff -Nur icedtea-2.3.4.orig/patches/topdir-openwrt.patch icedtea-2.3.4/patches/topdir-openwrt.patch ---- icedtea-2.3.4.orig/patches/topdir-openwrt.patch 1970-01-01 01:00:00.000000000 +0100 -+++ icedtea-2.3.4/patches/topdir-openwrt.patch 2013-02-12 09:37:29.000000000 +0100 -@@ -0,0 +1,14 @@ -+diff -Nur openjdk-boot.orig/Makefile icedtea7-forest-2-3-8bd8e70d4a03.2/Makefile -+--- openjdk-boot.orig/Makefile 2013-01-14 23:24:55.000000000 +0100 -++++ openjdk-boot/Makefile 2013-02-11 17:28:22.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 |