From f20ae8d331f414d82c19aaa00ebe5435458bf307 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 8 Jan 2014 20:05:15 +0100
Subject: add linker script, exit when not available

---
 package/eglibc/Makefile          | 2 +-
 package/eglibc/files/libc.so.arm | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 package/eglibc/files/libc.so.arm

diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index 1ee599707..5c21cac3a 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -42,7 +42,7 @@ eglibc-static-install:
 eglibc-dev-install:
 	${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/$(ADK_TARGET_LIBC_PATH) $(IDIR_EGLIBC_DEV)/usr/lib
 	# install linker script
-	-cp ./files/libc.so.$(CPU_ARCH) $(IDIR_EGLIBC_DEV)/usr/lib/libc.so
+	cp ./files/libc.so.$(CPU_ARCH) $(IDIR_EGLIBC_DEV)/usr/lib/libc.so
 ifeq ($(ADK_TARGET_ABI_O32),y)
 ifeq ($(ADK_big),y)
 	$(SED) "s#@@ELFTARGET@@#elf32-tradbigmips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so
diff --git a/package/eglibc/files/libc.so.arm b/package/eglibc/files/libc.so.arm
new file mode 100644
index 000000000..a79b29aa3
--- /dev/null
+++ b/package/eglibc/files/libc.so.arm
@@ -0,0 +1,5 @@
+/* GNU ld script
+   Use the shared library, but some functions are only in
+   the static library, so try that secondarily.  */
+OUTPUT_FORMAT(elf32-littlearm)
+GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux.so.3 ) )
-- 
cgit v1.2.3


From 28179a5675f9f8c417d416c71d2c4d1fbdeae299 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 8 Jan 2014 20:22:09 +0100
Subject: fix linking

---
 package/tmsnc/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/tmsnc/Makefile b/package/tmsnc/Makefile
index 12f902cf1..b501b098a 100644
--- a/package/tmsnc/Makefile
+++ b/package/tmsnc/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		tmsnc
 PKG_VERSION:=		0.3.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		337dae91d4775e03b6681f61db56d2a7
 PKG_DESCR:=		a textbased MSN client
 PKG_SECTION:=		chat
@@ -16,6 +16,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,TMSNC,tmsnc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_LDFLAGS+=	-ltinfo
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${STAGING_TARGET_DIR}/usr \
 			--with-openssl=${STAGING_TARGET_DIR}/usr \
 			--with-ncurses=${STAGING_TARGET_DIR}
-- 
cgit v1.2.3


From 876f2127a4bcf6d2b623ce2070e3f082da58e3c5 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 8 Jan 2014 20:35:03 +0100
Subject: remove openjdk6

---
 TODO                                               |   1 -
 jtools/Makefile                                    |   9 +-
 jtools/openjdk/Makefile                            |  96 -------------
 jtools/openjdk/patches/disable-backtrace.patch     |  24 ----
 jtools/openjdk/patches/iconv.patch                 |  36 -----
 jtools/openjdk/patches/linux3.patch                |  11 --
 jtools/openjdk/patches/openjdk.patch               |  37 -----
 jtools/openjdk/patches/remove-libnsl.patch         |  72 ----------
 mk/build.mk                                        |   1 -
 package/openjdk/Makefile                           | 151 ---------------------
 package/openjdk/patches/cross-compile.patch        |  56 --------
 package/openjdk/patches/cxxflags-nozlib.patch      |  31 -----
 package/openjdk/patches/debug-javac.patch          |  18 ---
 package/openjdk/patches/disable-backtrace.patch    |  24 ----
 .../openjdk/patches/disable-freetype-check.patch   |  14 --
 package/openjdk/patches/disable-gamma.patch        |  19 ---
 package/openjdk/patches/dlopen-RTLD_NOLOAD.patch   |  15 --
 package/openjdk/patches/icedtea-arm-mkbc.patch     |  29 ----
 package/openjdk/patches/icedtea6-Makefile_in.patch |  32 -----
 package/openjdk/patches/iconv.patch                |  36 -----
 package/openjdk/patches/inc-path.patch             |  34 -----
 package/openjdk/patches/llvm-headers.patch         |  23 ----
 package/openjdk/patches/openjdk-6_Makefile.patch   |  16 ---
 package/openjdk/patches/qemu-sizer.patch           |  22 ---
 package/openjdk/patches/remove-Werror.patch        |  15 --
 package/openjdk/patches/remove-libnsl.patch        |  72 ----------
 package/openjdk/patches/rename-libnet.patch        | 127 -----------------
 .../openjdk/patches/shark-adlc-cross-compile.patch |  23 ----
 package/openjdk/patches/uClibc-compat.patch        |  96 -------------
 29 files changed, 1 insertion(+), 1139 deletions(-)
 delete mode 100644 jtools/openjdk/Makefile
 delete mode 100644 jtools/openjdk/patches/disable-backtrace.patch
 delete mode 100644 jtools/openjdk/patches/iconv.patch
 delete mode 100644 jtools/openjdk/patches/linux3.patch
 delete mode 100644 jtools/openjdk/patches/openjdk.patch
 delete mode 100644 jtools/openjdk/patches/remove-libnsl.patch
 delete mode 100644 package/openjdk/Makefile
 delete mode 100644 package/openjdk/patches/cross-compile.patch
 delete mode 100644 package/openjdk/patches/cxxflags-nozlib.patch
 delete mode 100644 package/openjdk/patches/debug-javac.patch
 delete mode 100644 package/openjdk/patches/disable-backtrace.patch
 delete mode 100644 package/openjdk/patches/disable-freetype-check.patch
 delete mode 100644 package/openjdk/patches/disable-gamma.patch
 delete mode 100644 package/openjdk/patches/dlopen-RTLD_NOLOAD.patch
 delete mode 100644 package/openjdk/patches/icedtea-arm-mkbc.patch
 delete mode 100644 package/openjdk/patches/icedtea6-Makefile_in.patch
 delete mode 100644 package/openjdk/patches/iconv.patch
 delete mode 100644 package/openjdk/patches/inc-path.patch
 delete mode 100644 package/openjdk/patches/llvm-headers.patch
 delete mode 100644 package/openjdk/patches/openjdk-6_Makefile.patch
 delete mode 100644 package/openjdk/patches/qemu-sizer.patch
 delete mode 100644 package/openjdk/patches/remove-Werror.patch
 delete mode 100644 package/openjdk/patches/remove-libnsl.patch
 delete mode 100644 package/openjdk/patches/rename-libnet.patch
 delete mode 100644 package/openjdk/patches/shark-adlc-cross-compile.patch
 delete mode 100644 package/openjdk/patches/uClibc-compat.patch

diff --git a/TODO b/TODO
index 2ca415ccc..a902a948b 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,6 @@
 - add grsec kernel patch
 - microblaze: add cfgfs partition to dts, add partition to spartan dts
 - use host-tools infrastructure for openjdk7
-- remove openjdk6
 - evaluate libguestfs for image creation
 - check for gcc and SSP again
 - port w3m
diff --git a/jtools/Makefile b/jtools/Makefile
index 4c911b33d..39143976b 100644
--- a/jtools/Makefile
+++ b/jtools/Makefile
@@ -3,15 +3,8 @@
 
 include $(TOPDIR)/rules.mk
 
-TARGETS:=
-ifneq ($(ADK_PACKAGE_OPENJDK),)
 # jikes is for ant
-TARGETS+=fastjar gcj ecj jikes classpath jamvm ant openjdk qemu
-endif
-ifneq ($(ADK_PACKAGE_OPENJDK7),)
-# jikes is for ant
-TARGETS+=fastjar gcj ecj jikes classpath jamvm ant openjdk7
-endif
+TARGETS:=fastjar gcj ecj jikes classpath jamvm ant openjdk7
 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
diff --git a/jtools/openjdk/Makefile b/jtools/openjdk/Makefile
deleted file mode 100644
index 32e0eac0e..000000000
--- a/jtools/openjdk/Makefile
+++ /dev/null
@@ -1,96 +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:=		openjdk
-PKG_VERSION:=		6
-PKG_EXTRAVER:=		b22-28_feb_2011
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		2d2bbbb0f9b81f1fec41ec730da8a933 \
-			fd3f35e8a8a2ef9a64c035ed66cea06d \
-			ef7a8b3624ea904bf584bc46d79b5e75 \
-			bc95c133620bd68c161cac9891592901 \
-			91adfd41e6f001add4f92ae31216b1e3 \
-			d526d0848c88607ce4e3a0a4edb75d50
-PKG_DESCR:=		OpenJDK Java VM
-PKG_SECTION:=		lang
-PKG_URL:=		http://openjdk.org/
-PKG_SITES:=		http://download.java.net/openjdk/jdk6/promoted/b22/ \
-			http://mirror.netcologne.de/apache.org/xml/xalan-j/binaries/ \
-			http://icedtea.classpath.org/download/drops/ \
-			http://icedtea.classpath.org/download/source/
-
-# autotools infrastructure for OpenJDK
-ICEDTEA_NAME:=		icedtea6
-ICEDTEA_VERSION:=	1.10
-
-# bootstrap JARs
-XALAN_NAME=		xalan-j
-XALAN_VERSION=		2_7_0
-
-# override generic extraction
-EXTRACT_OVERRIDE:=	1
-DISTFILES:=		openjdk-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz \
-			$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz \
-			jaxp144_01.zip \
-			jdk6-jaf-b20.zip \
-			jdk6-jaxws-b20.zip \
-			${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz
-
-WRKDIST=		${WRKDIR}
-WRKSRC=			${WRKDIST}/${ICEDTEA_NAME}-${ICEDTEA_VERSION}
-
-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
-
-do-extract:
-$(WRKDIST)/.extract: $(WRKDIST)/.extract_done
-	cd ${WRKDIST}; mkdir openjdk-$(PKG_VERSION); \
-		tar xzf $(TOPDIR)/dl/openjdk-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz -C openjdk-$(PKG_VERSION)
-	cd $(WRKDIST); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz
-	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/openjdk.patch
-	cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/iconv.patch
-	cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/remove-libnsl.patch
-	cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/linux3.patch
-	cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/disable-backtrace.patch
-	touch $@
-
-$(WRKDIST)/.configured: ${WRKDIST}/.extract
-	cd ${WRKBUILD}; rm -rf config.{cache,status}; \
-	export ${OPENJDK_NATIVE_ENV}; ./configure \
-		--enable-bootstrap \
-		--enable-zero \
-		--disable-openjdk-cross-compilation \
-		--with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
-		--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-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
-		--with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/java/ecj.jar \
-		--with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
-		--with-xalan2-serializer-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \
-		--with-xerces2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \
-		--without-rhino \
-		--disable-docs
-	touch $@
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
-	export ${OPENJDK_NATIVE_ENV}; $(MAKE) -C $(WRKBUILD)
-	touch $@
-
-${STAGING_JAVA_HOST_DIR}/bootstrap-jdk/bin/java: $(WRKBUILD)/.compiled
-	$(CP) $(WRKSRC)/openjdk.build/j2sdk-image $(STAGING_JAVA_HOST_DIR)/bootstrap-jdk
-	touch $@
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/jtools/openjdk/patches/disable-backtrace.patch b/jtools/openjdk/patches/disable-backtrace.patch
deleted file mode 100644
index 393ee9251..000000000
--- a/jtools/openjdk/patches/disable-backtrace.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-
- uClibc does not have backtrace support right now. Disable it for now.
-
---- openjdk-6.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c	2011-02-28 17:06:50.000000000 +0100
-+++ openjdk-6/jdk/src/solaris/native/sun/xawt/XToolkit.c	2011-08-08 10:45:01.445330729 +0200
-@@ -27,9 +27,6 @@
- #include <X11/Xutil.h>
- #include <X11/Xos.h>
- #include <X11/Xatom.h>
--#ifdef __linux__
--#include <execinfo.h>
--#endif
- 
- #include <jvm.h>
- #include <jni.h>
-@@ -689,7 +686,7 @@
-     return ret;
- }
- 
--#ifdef __linux__
-+#if 0
- void print_stack(void)
- {
-   void *array[10];
diff --git a/jtools/openjdk/patches/iconv.patch b/jtools/openjdk/patches/iconv.patch
deleted file mode 100644
index c607d2195..000000000
--- a/jtools/openjdk/patches/iconv.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-
- add required linker flags.
-
---- openjdk-6.orig/jdk/make/java/instrument/Makefile	2011-02-28 17:06:10.000000000 +0100
-+++ openjdk-6/jdk/make/java/instrument/Makefile	2011-04-11 23:14:27.571411016 +0200
-@@ -123,6 +123,8 @@
- # We don't want to link against -ljava
- JAVALIB=
- 
-+LDLIBS += -liconv
-+
- #
- # Add to ambient vpath so we pick up the library files
- #
---- openjdk-6.orig/jdk/make/java/npt/Makefile	2011-02-28 17:06:11.000000000 +0100
-+++ openjdk-6/jdk/make/java/npt/Makefile	2011-04-11 23:14:07.017670197 +0200
-@@ -65,6 +65,8 @@
- # We don't want to link against -ljava
- JAVALIB=
- 
-+LDLIBS += -liconv
-+
- # Add -export options to explicitly spell exported symbols
- ifeq ($(PLATFORM), windows)
-   OTHER_LCF += -export:nptInitialize -export:nptTerminate
---- openjdk-6.orig/jdk/make/sun/splashscreen/Makefile	2011-02-28 17:06:12.000000000 +0100
-+++ openjdk-6/jdk/make/sun/splashscreen/Makefile	2011-04-11 23:15:07.221411030 +0200
-@@ -55,6 +55,8 @@
- 
- JAVALIB=
- 
-+LDLIBS += -liconv
-+
- #
- # C Flags
- #
diff --git a/jtools/openjdk/patches/linux3.patch b/jtools/openjdk/patches/linux3.patch
deleted file mode 100644
index bf6ccaa28..000000000
--- a/jtools/openjdk/patches/linux3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- openjdk-6.orig/hotspot/make/linux/Makefile	2011-02-28 17:03:13.000000000 +0100
-+++ openjdk-6/hotspot/make/linux/Makefile	2012-03-27 22:44:07.897199377 +0200
-@@ -230,7 +230,7 @@
- # Solaris 2.5.1, 2.6).
- # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
- 
--SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7%
-+SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7% 3.0% 3.1% 3.2% 3.3%
- OS_VERSION := $(shell uname -r)
- EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
- 
diff --git a/jtools/openjdk/patches/openjdk.patch b/jtools/openjdk/patches/openjdk.patch
deleted file mode 100644
index 85fbb87f4..000000000
--- a/jtools/openjdk/patches/openjdk.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-
-use precompiled ecj.
-
---- openjdk-6.orig/Makefile	2011-02-28 17:02:07.000000000 +0100
-+++ openjdk-6/Makefile	2011-04-06 19:47:19.261818496 +0200
-@@ -25,9 +25,7 @@
- 
- BUILD_PARENT_DIRECTORY=.
- 
--ifndef TOPDIR
--  TOPDIR:=.
--endif
-+TOPDIR:=.
- 
- ifndef JDK_TOPDIR
-   JDK_TOPDIR=$(TOPDIR)/jdk
---- icedtea6-1.10.orig/Makefile.in	2011-03-02 20:48:45.161291458 +0100
-+++ icedtea6-1.10/Makefile.in	2011-04-06 20:10:40.581819545 +0200
-@@ -1643,10 +1643,14 @@
- 
- stamps/native-ecj.stamp: 
- 	mkdir -p stamps ; \
--	if test "x$(GCJ)" != "xno"; then \
--	  $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
--	    --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
--	fi ; \
-+	if test -n "${ADK_ECJ}" && test -x "${ADK_ECJ}"; then \
-+		ln -s "${ADK_ECJ}" native-ecj; \
-+	else \
-+		if test "x$(GCJ)" != "xno"; then \
-+		  $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
-+		    --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
-+		fi ; \
-+	fi; \
- 	touch stamps/native-ecj.stamp
- 
- clean-native-ecj:
diff --git a/jtools/openjdk/patches/remove-libnsl.patch b/jtools/openjdk/patches/remove-libnsl.patch
deleted file mode 100644
index d867d436b..000000000
--- a/jtools/openjdk/patches/remove-libnsl.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-
- remove libnsl from linking.
-
---- openjdk-6.orig/jdk/make/java/hpi/hpi_common.gmk	2011-02-28 17:06:10.000000000 +0100
-+++ openjdk-6/jdk/make/java/hpi/hpi_common.gmk	2011-04-10 20:05:01.417672476 +0200
-@@ -86,5 +86,5 @@
- # Things that must be linked in.
- #
- ifneq ($(PLATFORM), windows)
--OTHER_LDLIBS += $(LIBSOCKET) -lnsl $(LIBM) -ldl
-+OTHER_LDLIBS += $(LIBSOCKET) $(LIBM) -ldl
- endif
---- openjdk-6.orig/jdk/make/java/java/Makefile	2011-02-28 17:06:10.000000000 +0100
-+++ openjdk-6/jdk/make/java/java/Makefile	2011-04-10 20:05:20.637673621 +0200
-@@ -205,7 +205,7 @@
- OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \
- 		       -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib
- else
--OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -lnsl -ldl \
-+OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -ldl \
- 		-L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH)
- endif
- 
---- openjdk-6.orig/jdk/make/java/net/Makefile	2011-02-28 17:06:10.000000000 +0100
-+++ openjdk-6/jdk/make/java/net/Makefile	2011-04-10 20:05:39.537672169 +0200
-@@ -97,7 +97,7 @@
-   # Will not compile at warning level 3 if warnings are fatal
-   COMPILER_WARNINGS_FATAL=false
- else
--  OTHER_LDLIBS = $(LIBSOCKET) -lnsl -ldl $(JVMLIB)
-+  OTHER_LDLIBS = $(LIBSOCKET) -ldl $(JVMLIB)
- endif
- ifeq ($(PLATFORM), linux)
-   OTHER_LDLIBS += -lpthread
---- openjdk-6.orig/jdk/make/jpda/transport/socket/Makefile	2011-02-28 17:06:11.000000000 +0100
-+++ openjdk-6/jdk/make/jpda/transport/socket/Makefile	2011-04-10 20:06:06.037672449 +0200
-@@ -42,11 +42,11 @@
- endif
- 
- ifeq ($(PLATFORM), linux)
--  OTHER_LDLIBS += -lnsl $(LIBSOCKET) -lpthread
-+  OTHER_LDLIBS += $(LIBSOCKET) -lpthread
- endif
- 
- ifeq ($(PLATFORM), solaris)
--  OTHER_LDLIBS += -lnsl $(LIBSOCKET)
-+  OTHER_LDLIBS += $(LIBSOCKET)
- endif
- 
- ifeq ($(PLATFORM), windows)
---- openjdk-6.orig/jdk/make/java/java_hprof_demo/Makefile	2011-02-28 17:06:10.000000000 +0100
-+++ openjdk-6/jdk/make/java/java_hprof_demo/Makefile	2011-04-10 20:28:43.287672398 +0200
-@@ -83,7 +83,7 @@
- ifeq ($(PLATFORM), windows)
-   OTHER_LDLIBS += wsock32.lib winmm.lib
- else
--  OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl
-+  OTHER_LDLIBS += $(LIBSOCKET) -ldl
- endif
- 
- #
---- openjdk-6.orig/jdk/make/mkdemo/jvmti/hprof/Makefile	2011-02-28 17:06:11.000000000 +0100
-+++ openjdk-6/jdk/make/mkdemo/jvmti/hprof/Makefile	2011-04-11 10:23:11.538911604 +0200
-@@ -42,7 +42,7 @@
-   OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl
- endif
- ifeq ($(PLATFORM), linux)
--  OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl -lpthread
-+  OTHER_LDLIBS += $(LIBSOCKET) -ldl -lpthread
- endif
- 
- #
diff --git a/mk/build.mk b/mk/build.mk
index abf2d4a7c..986d66cd7 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -26,7 +26,6 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_PACEMAKER=n \
 			ADK_PACKAGE_PACEMAKER_MGMTD=n \
 			ADK_PACKAGE_PACEMAKER_PYTHON_GUI=n \
-			ADK_PACKAGE_OPENJDK=n \
 			ADK_PACKAGE_OPENJDK7=n \
 			ADK_PACKAGE_CLASSPATH=n \
 			ADK_PACKAGE_GRUB=n \
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
deleted file mode 100644
index 9313c91a0..000000000
--- a/package/openjdk/Makefile
+++ /dev/null
@@ -1,151 +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:=		openjdk
-PKG_VERSION:=		6
-PKG_EXTRAVER:=		b22-28_feb_2011
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		2d2bbbb0f9b81f1fec41ec730da8a933 \
-			fd3f35e8a8a2ef9a64c035ed66cea06d \
-			ef7a8b3624ea904bf584bc46d79b5e75 \
-			bc95c133620bd68c161cac9891592901 \
-			91adfd41e6f001add4f92ae31216b1e3 \
-			d526d0848c88607ce4e3a0a4edb75d50
-PKG_DESCR:=		OpenJDK Java VM
-PKG_SECTION:=		lang
-PKG_BUILDDEP:=		alsa-lib xproto jpeg zlib giflib libpng freetype cups
-PKG_BUILDDEP+=		libX11 libXt libXp libXinerama libXrender libXtst libiconv-tiny
-PKG_DEPENDS:=		zlib libstdcxx libffi libpthread libxtst libxi
-PKG_URL:=		http://openjdk.org/
-PKG_SITES:=		http://download.java.net/openjdk/jdk6/promoted/b22/ \
-			http://mirror.netcologne.de/apache.org/xml/xalan-j/binaries/ \
-			http://icedtea.classpath.org/download/drops/ \
-			http://icedtea.classpath.org/download/source/
-
-PKG_HOST_DEPENDS:=	!darwin !cygwin !openbsd !netbsd !freebsd
-PKG_ARCH_DEPENDS:=	arm mips x86 x86_64
-PKG_SYSTEM_DEPENDS:=	!linksys-ag241 !fon-fon2100 !broadcom-bcm47xx
-
-# autotools infrastructure for OpenJDK
-ICEDTEA_NAME:=		icedtea6
-ICEDTEA_VERSION:=	1.10
-
-# bootstrap JARs
-XALAN_NAME=		xalan-j
-XALAN_VERSION=		2_7_0
-
-# override generic extraction
-EXTRACT_OVERRIDE:=	1
-DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz \
-			$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz \
-			jaxp144_01.zip \
-			jdk6-jaf-b20.zip \
-			jdk6-jaxws-b20.zip \
-			${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz
-
-WRKDIST=		${WRKDIR}
-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 (needs eglibc/glibc)
-PKGCB_SHARK:=		llvm
-PKGCD_CACAO:=		Cacao JIT backend
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,OPENJDK,openjdk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-# segfaults with march=pentium-m/atom
-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
-
-ifeq ($(ADK_PACKAGE_OPENJDK_ZERO),y)
-CONFIGURE_BACKEND:=	--enable-zero
-endif
-ifeq ($(ADK_PACKAGE_OPENJDK_SHARK),y)
-CONFIGURE_BACKEND:=	--enable-shark \
-			--with-llvm-config=$(STAGING_TARGET_DIR)/usr/bin/llvm-config
-endif
-ifeq ($(ADK_PACKAGE_OPENJDK_CACAO),y)
-CONFIGURE_BACKEND:=	--enable-cacao
-endif
-
-CONFIGURE_COMMON:=	--disable-docs \
-			--enable-openjdk-cross-compilation \
-			--with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
-			--with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
-			--with-xalan2-serializer-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \
-			--with-xerces2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \
-			--with-jdk-home=$(BOOTSTRAPJDK) \
-			--with-java=$(BOOTSTRAPJDK)/bin/java \
-			--with-javac=$(BOOTSTRAPJDK)/bin/javac \
-			--with-javah=$(BOOTSTRAPJDK)/bin/javah \
-			--with-jar=$(BOOTSTRAPJDK)/bin/jar \
-			--with-rmic=$(BOOTSTRAPJDK)/bin/rmic \
-			--with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \
-			--with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
-			--without-rhino
-
-CONFIGURE_ARGS+=	$(CONFIGURE_BACKEND)
-CONFIGURE_ARGS+=	$(CONFIGURE_COMMON)
-CONFIGURE_ARGS+=	--disable-bootstrap
-
-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 \
-			OTHER_CFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \
-			OTHER_CXXFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \
-			GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(ARCH)
-
-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
-	$(SED) "s#OTHER_CXXFLAGS#CXXFLAGS_COMMON#" ${WRKDIST}/$(PKG_NAME)-$(PKG_VERSION)/jdk/make/com/sun/java/pack/Makefile
-
-do-extract:
-	cd ${WRKDIST}; mkdir $(PKG_NAME)-$(PKG_VERSION); \
-		tar xzf $(TOPDIR)/dl/$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz -C $(PKG_NAME)-$(PKG_VERSION)
-	cd $(WRKDIST); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz
-	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
-
-pre-configure:
-	cd ${WRKBUILD}; rm -rf config.{cache,status}; \
-	export $(MAKE_ENV); ./configure \
-			${CONFIGURE_TRIPLE} \
-			$(CONFIGURE_BACKEND) \
-	   		--prefix=/usr \
-			--bindir=/usr/bin \
-	    		--datadir=/usr/share \
-	                --mandir=/usr/share/man \
-	  		--libexecdir=/usr/libexec \
-			--localstatedir=/var \
-			--sysconfdir=/etc \
-			--enable-bootstrap \
-			$(CONFIGURE_COMMON) ;\
-	env ${MAKE_ENV} $(MAKE) icedtea-ecj
-	# fixup symlinks to bootstrap jdk
-	ln -sf $(BOOTSTRAPJDK)/bin/java $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/java
-	ln -sf $(BOOTSTRAPJDK)/bin/javac $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/javac
-	ln -sf $(BOOTSTRAPJDK)/bin/javah $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/javah
-	ln -sf $(BOOTSTRAPJDK)/bin/jar $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/jar
-
-openjdk-install:
-	$(INSTALL_DIR) $(IDIR_OPENJDK)/usr
-	$(CP) $(WRKBUILD)/openjdk.build/j2re-image/* $(IDIR_OPENJDK)/usr 
-	rm -rf $(IDIR_OPENJDK)/usr/man
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openjdk/patches/cross-compile.patch b/package/openjdk/patches/cross-compile.patch
deleted file mode 100644
index 604b5d6cb..000000000
--- a/package/openjdk/patches/cross-compile.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-
- disable wrong pathes to /usr, fix cross-compile
-
---- w-openjdk-6-1.orig/openjdk-6/jdk/make/sun/awt/Makefile	2011-02-28 17:06:11.000000000 +0100
-+++ w-openjdk-6-1/openjdk-6/jdk/make/sun/awt/Makefile	2011-08-07 17:00:37.676468717 +0200
-@@ -509,10 +509,7 @@
- #
- 
- ifeq ($(PLATFORM), linux)
--CPPFLAGS += -I$(MOTIF_DIR)/include \
--            -I$(OPENWIN_HOME)/include \
--            -I$(OPENWIN_HOME)/include/X11/extensions \
--            -I$(PLATFORM_SRC)/native/$(PKGDIR)/font 
-+CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font 
- endif
- CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
-             -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
-@@ -535,10 +532,6 @@
-             -I$(PLATFORM_SRC)/native/$(PKGDIR) \
- 	    $(EVENT_MODEL)
- 
--ifeq ($(PLATFORM), linux)
--LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
--endif
--
- LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
- 	   $(AWT_RUNPATH)
- 
---- w-openjdk-6-1.orig/openjdk-6/jdk/make/sun/xawt/Makefile	2011-02-28 17:06:12.000000000 +0100
-+++ w-openjdk-6-1/openjdk-6/jdk/make/sun/xawt/Makefile	2011-08-07 18:31:08.635355054 +0200
-@@ -96,6 +96,10 @@
- 
- CPPFLAGS += -I$(CUPS_HEADERS_PATH)
- 
-+ifeq ($(PLATFORM), linux)
-+CPPFLAGS += -I@ADK_TARGETDIR@/usr/include/X11/extensions
-+endif
-+
- CPPFLAGS += -DXAWT -DXAWT_HACK \
-         -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \
-         -I$(PLATFORM_SRC)/native/sun/awt \
-@@ -122,14 +126,6 @@
-         -I$(SHARE_SRC)/native/sun/awt \
-         -I$(PLATFORM_SRC)/native/sun/awt 
- 
--ifeq ($(PLATFORM), linux)
--# Allows for builds on Debian GNU Linux, X11 is in a different place 
--  CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
--              -I/usr/include/X11/extensions \
--              -I$(MOTIF_DIR)/include \
--              -I$(OPENWIN_HOME)/include 
--endif
--
- ifeq ($(PLATFORM), solaris)
-   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions -I$(MOTIF_DIR)/include 
- endif
diff --git a/package/openjdk/patches/cxxflags-nozlib.patch b/package/openjdk/patches/cxxflags-nozlib.patch
deleted file mode 100644
index 67812253a..000000000
--- a/package/openjdk/patches/cxxflags-nozlib.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- w-openjdk-6.orig/icedtea6-1.10/patches/libraries.patch	2011-02-23 23:32:34.602901049 +0100
-+++ w-openjdk-6/icedtea6-1.10/patches/libraries.patch	2011-08-24 15:07:24.347475241 +0200
-@@ -24648,7 +24648,7 @@
- -	     $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
- -
- -  ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
---  OTHER_CXXFLAGS += $(ZINCLUDE)
-+-  CXXFLAGS_COMMON += $(ZINCLUDE)
- -  LDDFLAGS += $(ZIPOBJS)
- +            $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
- +            $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
-@@ -24663,7 +24663,7 @@
- +
- +  OTHER_LDLIBS += -lz
-  else
--   OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
-+   CXXFLAGS_COMMON += -DNO_ZLIB -DUNPACK_JNI
- -  OTHER_LDLIBS += $(JVMLIB)
- +  OTHER_LDLIBS += -lz $(JVMLIB)
-  endif
---- w-openjdk-6.orig/icedtea6-1.10/patches/linker-libs-order.patch	2011-02-23 23:32:34.653236038 +0100
-+++ w-openjdk-6/icedtea6-1.10/patches/linker-libs-order.patch	2011-08-24 15:53:05.047474381 +0200
-@@ -31,7 +31,7 @@
-  
- -  OTHER_LDLIBS += -lz
-  else
--   OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
-+   CXXFLAGS_COMMON += -DNO_ZLIB -DUNPACK_JNI
- -  OTHER_LDLIBS += -lz $(JVMLIB)
- +  OTHER_LDLIBS += $(JVMLIB)
-  endif
diff --git a/package/openjdk/patches/debug-javac.patch b/package/openjdk/patches/debug-javac.patch
deleted file mode 100644
index f130325ef..000000000
--- a/package/openjdk/patches/debug-javac.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- w-openjdk-6-1.orig/icedtea6-1.10.orig/javac.in	2011-02-23 23:32:18.635149341 +0100
-+++ w-openjdk-6-1/icedtea6-1.10/javac.in	2011-04-05 16:27:04.291962749 +0200
-@@ -37,6 +37,7 @@
- if ( -e "@abs_top_builddir@/native-ecj" )
- {
-     my @ecj_args = gen_ecj_opts( \@ARGV );
-+    print 'Using native ecj';
-     exec '@abs_top_builddir@/native-ecj', @ecj_parms, @ecj_args ;
- }
- elsif ( -e "@ECJ_JAR@" )
-@@ -45,6 +46,7 @@
-     my @CLASSPATH = ('@ECJ_JAR@');
-     push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
-     $ENV{"CLASSPATH"} = join ':', @CLASSPATH;
-+    print 'Using ecj with java';
-     exec '@JAVA@', 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @ecj_args;
- }
- else
diff --git a/package/openjdk/patches/disable-backtrace.patch b/package/openjdk/patches/disable-backtrace.patch
deleted file mode 100644
index f3d1424c1..000000000
--- a/package/openjdk/patches/disable-backtrace.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-
- uClibc does not have backtrace support right now. Disable it for now.
-
---- w-openjdk-6-1.orig/openjdk-6/jdk/src/solaris/native/sun/xawt/XToolkit.c	2011-02-28 17:06:50.000000000 +0100
-+++ w-openjdk-6-1/openjdk-6/jdk/src/solaris/native/sun/xawt/XToolkit.c	2011-08-08 10:45:01.445330729 +0200
-@@ -27,9 +27,6 @@
- #include <X11/Xutil.h>
- #include <X11/Xos.h>
- #include <X11/Xatom.h>
--#ifdef __linux__
--#include <execinfo.h>
--#endif
- 
- #include <jvm.h>
- #include <jni.h>
-@@ -689,7 +686,7 @@
-     return ret;
- }
- 
--#ifdef __linux__
-+#if 0
- void print_stack(void)
- {
-   void *array[10];
diff --git a/package/openjdk/patches/disable-freetype-check.patch b/package/openjdk/patches/disable-freetype-check.patch
deleted file mode 100644
index cde23910d..000000000
--- a/package/openjdk/patches/disable-freetype-check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-
- disable freetype sanity check, not cross-compile safe.
-
---- w-openjdk-6-1.orig/openjdk-6/jdk/make/common/shared/Sanity.gmk	2011-02-28 17:06:10.000000000 +0100
-+++ w-openjdk-6-1/openjdk-6/jdk/make/common/shared/Sanity.gmk	2011-04-05 14:05:29.691807661 +0200
-@@ -793,7 +793,7 @@
- # Check for availability of FreeType (OpenJDK specific)
- ######################################################
- 
--ifdef OPENJDK
-+ifdef OPENJDK_DISABLED
- 
- #name of test program that prints out "Failed" if freetype is not good enough
- FREETYPE_VERSION_CHECK_NAME = freetype_versioncheck
diff --git a/package/openjdk/patches/disable-gamma.patch b/package/openjdk/patches/disable-gamma.patch
deleted file mode 100644
index 5dc1b2723..000000000
--- a/package/openjdk/patches/disable-gamma.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-
- Fails when cross-compilation is done, disable it.
-
---- w-openjdk-6-1.orig/openjdk-6/hotspot/make/linux/makefiles/buildtree.make	2011-02-28 17:03:13.000000000 +0100
-+++ w-openjdk-6-1/openjdk-6/hotspot/make/linux/makefiles/buildtree.make	2011-04-11 12:47:31.000000000 +0200
-@@ -352,12 +352,8 @@
- 	echo "if [ -z \$$JAVA_HOME ]; then { $(NO_JAVA_HOME_MSG); exit 0; }; fi"; \
- 	echo "if ! \$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion 2>&1 > /dev/null"; \
- 	echo "then"; \
--	echo "  $(WRONG_DATA_MODE_MSG); exit 0;"; \
-+	echo "  exit 0;"; \
- 	echo "fi"; \
--	echo "rm -f Queens.class"; \
--	echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \
--	echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \
--	echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \
- 	) > $@
- 	$(QUIETLY) chmod +x $@
- 
diff --git a/package/openjdk/patches/dlopen-RTLD_NOLOAD.patch b/package/openjdk/patches/dlopen-RTLD_NOLOAD.patch
deleted file mode 100644
index cd228391b..000000000
--- a/package/openjdk/patches/dlopen-RTLD_NOLOAD.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-
- the option RTLOD_NOLOAD is not portable. (not available in uClibc)
- https://evolvis.org/scm/viewvc.php/jalimo/trunk/oe-overlay/packages/openjdk/openjdk-6-6b18-1.8/icedtea-jdk-RTLD_NOLOAD.patch?revision=840&view=markup&pathrev=867
-
---- w-openjdk-6.orig/openjdk-6/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	2011-02-28 17:06:50.000000000 +0100
-+++ w-openjdk-6/openjdk-6/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	2011-08-10 14:41:26.700571862 +0200
-@@ -51,7 +51,7 @@
- {
-     const char *libName = (*env)->GetStringUTFChars(env, jLibName, NULL);
-     // look up existing handle only, do not load
--    void *hModule = dlopen(libName, RTLD_NOLOAD);
-+    void *hModule = dlopen(libName, RTLD_LAZY);
-     dprintf2("-handle for %s: %u\n", libName, hModule);
-     (*env)->ReleaseStringUTFChars(env, jLibName, libName);
-     return (jlong)hModule;
diff --git a/package/openjdk/patches/icedtea-arm-mkbc.patch b/package/openjdk/patches/icedtea-arm-mkbc.patch
deleted file mode 100644
index 9df3ebbf4..000000000
--- a/package/openjdk/patches/icedtea-arm-mkbc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-
- execute mkoffsets via Qemu and build mkbc with the host compiler.
-
---- w-openjdk-6-1.orig/icedtea6-1.10/patches/arm.patch	2011-02-23 23:32:32.909601440 +0100
-+++ w-openjdk-6-1/icedtea6-1.10/patches/arm.patch	2011-08-09 20:05:56.721765260 +0200
-@@ -25,7 +25,7 @@
- +
- +offsets_arm.s:	mkoffsets
- +	@echo Generating assembler offsets
--+	./mkoffsets > $@
-++	$(QEMU) ./mkoffsets > $@
- +
- +bytecodes_arm.s: bytecodes_arm.def mkbc
- +	@echo Generatine ARM assembler bytecode sequences
-@@ -33,12 +33,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) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
-++	$(CC_COMPILE) -static -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
- +
- +endif
- +
diff --git a/package/openjdk/patches/icedtea6-Makefile_in.patch b/package/openjdk/patches/icedtea6-Makefile_in.patch
deleted file mode 100644
index 7febd6cac..000000000
--- a/package/openjdk/patches/icedtea6-Makefile_in.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- w-openjdk-6-1.orig/icedtea6-1.10/Makefile.in	2011-03-02 20:48:45.000000000 +0100
-+++ w-openjdk-6-1/icedtea6-1.10/Makefile.in	2011-04-02 23:33:17.000000000 +0200
-@@ -1576,7 +1576,7 @@ clean-overlay:
- # FIXME (missing): Rename to clone-ecj.
- stamps/extract-ecj.stamp: $(OPENJDK_TREE)
- 	if ! test -d openjdk-ecj ; then \
--	    cp -pPRl openjdk openjdk-ecj ; \
-+	    cp -pPR openjdk openjdk-ecj ; \
- 	fi
- 	mkdir -p stamps
- 	touch stamps/extract-ecj.stamp
-@@ -1642,11 +1642,15 @@ clean-patch-ecj:
- # ===========================
- 
- stamps/native-ecj.stamp: 
--	mkdir -p stamps ; \
--	if test "x$(GCJ)" != "xno"; then \
--	  $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
--	    --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
--	fi ; \
-+	mkdir -p stamps ; \
-+	if test -n "${ADK_ECJ}" && test -x "${ADK_ECJ}"; then \
-+		ln -s "${ADK_ECJ}" native-ecj; \
-+	else \
-+		if test "x$(GCJ)" != "xno"; then \
-+		  $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
-+		    --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
-+		fi ; \
-+	fi; \
- 	touch stamps/native-ecj.stamp
- 
- clean-native-ecj:
diff --git a/package/openjdk/patches/iconv.patch b/package/openjdk/patches/iconv.patch
deleted file mode 100644
index b79971930..000000000
--- a/package/openjdk/patches/iconv.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-
- add required linker flags.
-
---- w-openjdk-6.orig/openjdk-6/jdk/make/java/instrument/Makefile	2011-02-28 17:06:10.000000000 +0100
-+++ w-openjdk-6/openjdk-6/jdk/make/java/instrument/Makefile	2011-04-11 23:14:27.571411016 +0200
-@@ -123,6 +123,8 @@
- # We don't want to link against -ljava
- JAVALIB=
- 
-+LDLIBS += -liconv
-+
- #
- # Add to ambient vpath so we pick up the library files
- #
---- w-openjdk-6.orig/openjdk-6/jdk/make/java/npt/Makefile	2011-02-28 17:06:11.000000000 +0100
-+++ w-openjdk-6/openjdk-6/jdk/make/java/npt/Makefile	2011-04-11 23:14:07.017670197 +0200
-@@ -65,6 +65,8 @@
- # We don't want to link against -ljava
- JAVALIB=
- 
-+LDLIBS += -liconv
-+
- # Add -export options to explicitly spell exported symbols
- ifeq ($(PLATFORM), windows)
-   OTHER_LCF += -export:nptInitialize -export:nptTerminate
---- w-openjdk-6.orig/openjdk-6/jdk/make/sun/splashscreen/Makefile	2011-02-28 17:06:12.000000000 +0100
-+++ w-openjdk-6/openjdk-6/jdk/make/sun/splashscreen/Makefile	2011-04-11 23:15:07.221411030 +0200
-@@ -55,6 +55,8 @@
- 
- JAVALIB=
- 
-+LDLIBS += -liconv
-+
- #
- # C Flags
- #
diff --git a/package/openjdk/patches/inc-path.patch b/package/openjdk/patches/inc-path.patch
deleted file mode 100644
index 4a195f03e..000000000
--- a/package/openjdk/patches/inc-path.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-
- disable wrong pathes for cross-compilation
-
---- w-openjdk-6-1.orig/openjdk-6/jdk/make/common/shared/Defs-linux.gmk	2011-02-28 17:06:10.000000000 +0100
-+++ w-openjdk-6-1/openjdk-6/jdk/make/common/shared/Defs-linux.gmk	2011-08-08 10:07:58.975256728 +0200
-@@ -170,7 +170,7 @@
-   GCC29_COMPILER_PATH = $(JDK_DEVTOOLS_DIR)/$(PLATFORM)/gcc29/usr/
- endif
- 
--_CUPS_HEADERS_PATH=/usr/include
-+_CUPS_HEADERS_PATH=/usr/include/disabled
- 
- # Import JDK images allow for partial builds, components not built are
- #    imported (or copied from) these import areas when needed.
---- w-openjdk-6-1.orig/openjdk-6/jdk/make/common/Defs.gmk	2011-02-28 17:06:10.000000000 +0100
-+++ w-openjdk-6-1/openjdk-6/jdk/make/common/Defs.gmk	2011-08-10 18:50:53.248017538 +0200
-@@ -156,7 +156,7 @@
-     ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true)
-       FREETYPE_LIB_PATH = $(DEVTOOLS_FT_DIR)/lib
-     else
--      FREETYPE_LIB_PATH = /usr/lib
-+      FREETYPE_LIB_PATH = /usr/lib/disabled
-       USING_SYSTEM_FT_LIB=true
-     endif
-   endif 
-@@ -173,7 +173,7 @@
-     ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true)
-       FREETYPE_HEADERS_PATH = $(DEVTOOLS_FT_DIR)/include
-     else
--      FREETYPE_HEADERS_PATH = /usr/include
-+      FREETYPE_HEADERS_PATH = /usr/include/disabled
-     endif
-   endif
- endif
diff --git a/package/openjdk/patches/llvm-headers.patch b/package/openjdk/patches/llvm-headers.patch
deleted file mode 100644
index 25dd137d9..000000000
--- a/package/openjdk/patches/llvm-headers.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-
- fix wrong header path
-
---- w-openjdk-6.orig/openjdk-6/hotspot/src/share/vm/shark/llvmHeaders.hpp	2011-02-28 17:03:21.000000000 +0100
-+++ w-openjdk-6/openjdk-6/hotspot/src/share/vm/shark/llvmHeaders.hpp	2011-04-29 18:07:20.171550601 +0200
-@@ -43,7 +43,7 @@
- #include <llvm/ModuleProvider.h>
- #endif
- #include <llvm/Support/IRBuilder.h>
--#include <llvm/System/Threading.h>
-+#include <llvm/Support/Threading.h>
- #include <llvm/Target/TargetSelect.h>
- #include <llvm/Type.h>
- #include <llvm/ExecutionEngine/JITMemoryManager.h>
-@@ -52,7 +52,7 @@
- #include <llvm/ExecutionEngine/JIT.h>
- #include <llvm/ADT/StringMap.h>
- #include <llvm/Support/Debug.h>
--#include <llvm/System/Host.h>
-+#include <llvm/Support/Host.h>
- #endif
- 
- #include <map>
diff --git a/package/openjdk/patches/openjdk-6_Makefile.patch b/package/openjdk/patches/openjdk-6_Makefile.patch
deleted file mode 100644
index 4425eff7c..000000000
--- a/package/openjdk/patches/openjdk-6_Makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
- TOPDIR is already used by build system, so always set it.
-
---- w-openjdk-6-1.orig/openjdk-6/Makefile	2011-02-28 17:02:07.000000000 +0100
-+++ w-openjdk-6-1/openjdk-6/Makefile	2011-03-28 20:06:13.751809044 +0200
-@@ -25,9 +25,7 @@
- 
- BUILD_PARENT_DIRECTORY=.
- 
--ifndef TOPDIR
--  TOPDIR:=.
--endif
-+TOPDIR:=.
- 
- ifndef JDK_TOPDIR
-   JDK_TOPDIR=$(TOPDIR)/jdk
diff --git a/package/openjdk/patches/qemu-sizer.patch b/package/openjdk/patches/qemu-sizer.patch
deleted file mode 100644
index b0049e852..000000000
--- a/package/openjdk/patches/qemu-sizer.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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-08-20 18:45:28.499240773 +0200
-@@ -225,7 +225,7 @@
- 
- $(SIZERS): $(SIZERS_C) 
- 	$(prep-target)
--	$(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c
-+	$(CC) -static $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c
- 
- $(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA)
- 	$(prep-target)
-@@ -243,8 +243,8 @@
- 	    $(CP) $(PREDEFINED_SIZES_TMPL) $@; \
- 	    $(CHMOD) +w $@;\
- 	else	\
--	    $(ECHO) GENERATING $@; \
--	    $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
-+	    $(ECHO) GENERATING $@ via $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer..; \
-+	    $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
- 	fi
- 	@if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
- 	    $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
diff --git a/package/openjdk/patches/remove-Werror.patch b/package/openjdk/patches/remove-Werror.patch
deleted file mode 100644
index 445165781..000000000
--- a/package/openjdk/patches/remove-Werror.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- 
- disable -Werror
-
---- w-openjdk-6.orig/openjdk-6/hotspot/make/linux/makefiles/gcc.make	2011-02-28 17:03:13.000000000 +0100
-+++ w-openjdk-6/openjdk-6/hotspot/make/linux/makefiles/gcc.make	2011-08-19 18:18:55.997423368 +0200
-@@ -108,9 +108,6 @@
-   CFLAGS += -pipe
- endif
- 
--# Compiler warnings are treated as errors
--WARNINGS_ARE_ERRORS = -Werror
--
- # Except for a few acceptable ones
- # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
- # conversions which might affect the values. To avoid that, we need to turn
diff --git a/package/openjdk/patches/remove-libnsl.patch b/package/openjdk/patches/remove-libnsl.patch
deleted file mode 100644
index 965829fd6..000000000
--- a/package/openjdk/patches/remove-libnsl.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-
- remove libnsl from linking.
-
---- w-openjdk-6-1.orig/openjdk-6/jdk/make/java/hpi/hpi_common.gmk	2011-02-28 17:06:10.000000000 +0100
-+++ w-openjdk-6-1/openjdk-6/jdk/make/java/hpi/hpi_common.gmk	2011-04-10 20:05:01.417672476 +0200
-@@ -86,5 +86,5 @@
- # Things that must be linked in.
- #
- ifneq ($(PLATFORM), windows)
--OTHER_LDLIBS += $(LIBSOCKET) -lnsl $(LIBM) -ldl
-+OTHER_LDLIBS += $(LIBSOCKET) $(LIBM) -ldl
- endif
---- w-openjdk-6-1.orig/openjdk-6/jdk/make/java/java/Makefile	2011-02-28 17:06:10.000000000 +0100
-+++ w-openjdk-6-1/openjdk-6/jdk/make/java/java/Makefile	2011-04-10 20:05:20.637673621 +0200
-@@ -205,7 +205,7 @@
- OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \
- 		       -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib
- else
--OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -lnsl -ldl \
-+OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -ldl \
- 		-L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH)
- endif
- 
---- w-openjdk-6-1.orig/openjdk-6/jdk/make/java/net/Makefile	2011-02-28 17:06:10.000000000 +0100
-+++ w-openjdk-6-1/openjdk-6/jdk/make/java/net/Makefile	2011-04-10 20:05:39.537672169 +0200
-@@ -97,7 +97,7 @@
-   # Will not compile at warning level 3 if warnings are fatal
-   COMPILER_WARNINGS_FATAL=false
- else
--  OTHER_LDLIBS = $(LIBSOCKET) -lnsl -ldl $(JVMLIB)
-+  OTHER_LDLIBS = $(LIBSOCKET) -ldl $(JVMLIB)
- endif
- ifeq ($(PLATFORM), linux)
-   OTHER_LDLIBS += -lpthread
---- w-openjdk-6-1.orig/openjdk-6/jdk/make/jpda/transport/socket/Makefile	2011-02-28 17:06:11.000000000 +0100
-+++ w-openjdk-6-1/openjdk-6/jdk/make/jpda/transport/socket/Makefile	2011-04-10 20:06:06.037672449 +0200
-@@ -42,11 +42,11 @@
- endif
- 
- ifeq ($(PLATFORM), linux)
--  OTHER_LDLIBS += -lnsl $(LIBSOCKET) -lpthread
-+  OTHER_LDLIBS += $(LIBSOCKET) -lpthread
- endif
- 
- ifeq ($(PLATFORM), solaris)
--  OTHER_LDLIBS += -lnsl $(LIBSOCKET)
-+  OTHER_LDLIBS += $(LIBSOCKET)
- endif
- 
- ifeq ($(PLATFORM), windows)
---- w-openjdk-6-1.orig/openjdk-6/jdk/make/java/java_hprof_demo/Makefile	2011-02-28 17:06:10.000000000 +0100
-+++ w-openjdk-6-1/openjdk-6/jdk/make/java/java_hprof_demo/Makefile	2011-04-10 20:28:43.287672398 +0200
-@@ -83,7 +83,7 @@
- ifeq ($(PLATFORM), windows)
-   OTHER_LDLIBS += wsock32.lib winmm.lib
- else
--  OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl
-+  OTHER_LDLIBS += $(LIBSOCKET) -ldl
- endif
- 
- #
---- w-openjdk-6-1.orig/openjdk-6/jdk/make/mkdemo/jvmti/hprof/Makefile	2011-02-28 17:06:11.000000000 +0100
-+++ w-openjdk-6-1/openjdk-6/jdk/make/mkdemo/jvmti/hprof/Makefile	2011-04-11 10:23:11.538911604 +0200
-@@ -42,7 +42,7 @@
-   OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl
- endif
- ifeq ($(PLATFORM), linux)
--  OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl -lpthread
-+  OTHER_LDLIBS += $(LIBSOCKET) -ldl -lpthread
- endif
- 
- #
diff --git a/package/openjdk/patches/rename-libnet.patch b/package/openjdk/patches/rename-libnet.patch
deleted file mode 100644
index 671c80dcc..000000000
--- a/package/openjdk/patches/rename-libnet.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-https://evolvis.org/scm/viewvc.php/jalimo/trunk/oe-overlay/packages/openjdk/openjdk-6-6b18-1.8/icedtea-libnet-renaming.patch?revision=864&view=markup&pathrev=867
---- w-openjdk-6.orig/openjdk-6/jdk/make/java/net/Makefile	2011-02-28 17:06:10.000000000 +0100
-+++ w-openjdk-6/openjdk-6/jdk/make/java/net/Makefile	2011-09-02 16:20:55.597991415 +0200
-@@ -25,7 +25,7 @@
- 
- BUILDDIR = ../..
- PACKAGE = java.net
--LIBRARY = net
-+LIBRARY = javanet
- PRODUCT = sun
- include $(BUILDDIR)/common/Defs.gmk
- 
---- w-openjdk-6.orig/openjdk-6/jdk/make/java/nio/Makefile	2011-02-28 17:06:11.000000000 +0100
-+++ w-openjdk-6/openjdk-6/jdk/make/java/nio/Makefile	2011-09-02 16:21:37.817990454 +0200
-@@ -135,11 +135,11 @@
- endif
- ifeq ($(PLATFORM), linux)
- COMPILER_WARNINGS_FATAL=true
--OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
-+OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread -ldl
- endif
- ifeq ($(PLATFORM), solaris)
- OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 -ldl \
--		-L$(LIBDIR)/$(LIBARCH) -ljava -lnet
-+		-L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet
- endif # PLATFORM
- 
- #
---- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2011-02-28 17:06:22.000000000 +0100
-+++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2011-09-02 16:22:26.507995127 +0200
-@@ -59,7 +59,7 @@
-      */
-     static {
-         java.security.AccessController.doPrivileged(
--                  new sun.security.action.LoadLibraryAction("net"));
-+                  new sun.security.action.LoadLibraryAction("javanet"));
-     }
- 
-     /**
---- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2011-02-28 17:06:22.000000000 +0100
-+++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2011-09-02 16:22:58.041740544 +0200
-@@ -79,7 +79,7 @@
-      */
-     static {
-         java.security.AccessController.doPrivileged(
--                  new sun.security.action.LoadLibraryAction("net"));
-+                  new sun.security.action.LoadLibraryAction("javanet"));
-     }
- 
-     /**
---- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/DatagramPacket.java	2011-02-28 17:06:22.000000000 +0100
-+++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/DatagramPacket.java	2011-09-02 16:23:20.197991292 +0200
-@@ -47,7 +47,7 @@
-      */
-     static {
-         java.security.AccessController.doPrivileged(
--                  new sun.security.action.LoadLibraryAction("net"));
-+                  new sun.security.action.LoadLibraryAction("javanet"));
-         init();
-     }
- 
---- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/InetAddress.java	2011-02-28 17:06:22.000000000 +0100
-+++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/InetAddress.java	2011-09-02 16:23:57.670490341 +0200
-@@ -231,7 +231,7 @@
-     static {
-         preferIPv6Address = java.security.AccessController.doPrivileged(
-             new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
--        AccessController.doPrivileged(new LoadLibraryAction("net"));
-+        AccessController.doPrivileged(new LoadLibraryAction("javanet"));
-         init();
-     }
- 
---- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/NetworkInterface.java	2011-02-28 17:06:22.000000000 +0100
-+++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/NetworkInterface.java	2011-09-02 16:24:13.879239438 +0200
-@@ -52,7 +52,7 @@
-     private boolean virtual = false;
- 
-     static {
--        AccessController.doPrivileged(new LoadLibraryAction("net"));
-+        AccessController.doPrivileged(new LoadLibraryAction("javanet"));
-         init();
-     }
- 
---- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2011-02-28 17:06:34.000000000 +0100
-+++ w-openjdk-6/openjdk-6/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2011-09-02 16:24:50.877990409 +0200
-@@ -89,7 +89,7 @@
-                 }});
-         if (b != null && b.booleanValue()) {
-             java.security.AccessController.doPrivileged(
--                      new sun.security.action.LoadLibraryAction("net"));
-+                      new sun.security.action.LoadLibraryAction("javanet"));
-             hasSystemProxies = init();
-         }
-     }
---- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/sun/nio/ch/Util.java	2011-02-28 17:06:35.000000000 +0100
-+++ w-openjdk-6/openjdk-6/jdk/src/share/classes/sun/nio/ch/Util.java	2011-09-02 16:25:45.749240462 +0200
-@@ -354,7 +354,7 @@
-                 return;
-             loaded = true;
-             java.security.AccessController
--                .doPrivileged(new sun.security.action.LoadLibraryAction("net"));
-+                .doPrivileged(new sun.security.action.LoadLibraryAction("javanet"));
-             java.security.AccessController
-                 .doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
-             // IOUtil must be initialized; Its native methods are called from
---- w-openjdk-6.orig/openjdk-6/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2011-02-28 17:06:48.000000000 +0100
-+++ w-openjdk-6/openjdk-6/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2011-09-02 16:26:36.017990742 +0200
-@@ -244,7 +244,7 @@
- 
-     static {
-         java.security.AccessController.doPrivileged(
--            new sun.security.action.LoadLibraryAction("net"));
-+            new sun.security.action.LoadLibraryAction("javanet"));
-     }
- 
- }
---- w-openjdk-6.orig/openjdk-6/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2011-02-28 17:06:51.000000000 +0100
-+++ w-openjdk-6/openjdk-6/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2011-09-02 16:27:07.069240501 +0200
-@@ -160,7 +160,7 @@
- 
-     static {
-         java.security.AccessController.doPrivileged(
--            new sun.security.action.LoadLibraryAction("net"));
-+            new sun.security.action.LoadLibraryAction("javanet"));
-         init0();
- 
-         // start the address listener thread
diff --git a/package/openjdk/patches/shark-adlc-cross-compile.patch b/package/openjdk/patches/shark-adlc-cross-compile.patch
deleted file mode 100644
index fc3b804ea..000000000
--- a/package/openjdk/patches/shark-adlc-cross-compile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-
- Execute adlc via Qemu.
-
---- w-openjdk-6.orig/openjdk-6/hotspot/make/linux/makefiles/adlc.make	2011-02-28 17:03:13.000000000 +0100
-+++ w-openjdk-6/openjdk-6/hotspot/make/linux/makefiles/adlc.make	2011-08-17 13:05:55.317470977 +0200
-@@ -103,7 +103,7 @@
- 
- $(EXEC) : $(OBJECTS)
- 	@echo Making adlc
--	$(QUIETLY) $(LINK_NOPROF.CC) -o $(EXEC) $(OBJECTS)
-+	$(QUIETLY) $(LINK_NOPROF.CC) -static -o $(EXEC) $(OBJECTS)
- 
- # Random dependencies:
- $(OBJECTS): opcodes.hpp classes.hpp adlc.hpp adlcVMDeps.hpp adlparse.hpp archDesc.hpp arena.hpp dict2.hpp filebuff.hpp forms.hpp formsopt.hpp formssel.hpp
-@@ -170,7 +170,7 @@
- #
- refresh_adfiles: $(EXEC) $(SOURCE.AD) $(ADLC_UPDATER)
- 	@rm -rf $(TEMPDIR); mkdir $(TEMPDIR)
--	$(QUIETLY) $(EXEC) $(ADLCFLAGS) $(SOURCE.AD) \
-+	$(QEMU) $(EXEC) $(ADLCFLAGS) $(SOURCE.AD) \
-  -c$(TEMPDIR)/ad_$(Platform_arch_model).cpp -h$(TEMPDIR)/ad_$(Platform_arch_model).hpp -a$(TEMPDIR)/dfa_$(Platform_arch_model).cpp -v$(TEMPDIR)/adGlobals_$(Platform_arch_model).hpp \
- 	    || { rm -rf $(TEMPDIR); exit 1; }
- 	$(QUIETLY) ./$(ADLC_UPDATER) ad_$(Platform_arch_model).cpp $(TEMPDIR) $(OUTDIR)
diff --git a/package/openjdk/patches/uClibc-compat.patch b/package/openjdk/patches/uClibc-compat.patch
deleted file mode 100644
index 1cc16cbb1..000000000
--- a/package/openjdk/patches/uClibc-compat.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-
- some uClibc compatibility hacks.
- Partly from https://evolvis.org/scm/viewvc.php/jalimo/trunk/oe-overlay/packages/openjdk/openjdk-6-6b18-1.8/
-
---- w-openjdk-6-1.orig/openjdk-6/hotspot/src/os/linux/vm/os_linux.cpp	2011-02-28 17:03:14.000000000 +0100
-+++ w-openjdk-6-1/openjdk-6/hotspot/src/os/linux/vm/os_linux.cpp	2011-08-07 14:30:00.195403776 +0200
-@@ -53,7 +53,6 @@
- # include <string.h>
- # include <syscall.h>
- # include <sys/sysinfo.h>
--# include <gnu/libc-version.h>
- # include <sys/ipc.h>
- # include <sys/shm.h>
- # include <link.h>
-@@ -553,9 +552,10 @@
-      os::Linux::set_glibc_version(str);
-   } else {
-      // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version()
--     static char _gnu_libc_version[32];
--     jio_snprintf(_gnu_libc_version, sizeof(_gnu_libc_version),
--              "glibc %s %s", gnu_get_libc_version(), gnu_get_libc_release());
-+     // static char _gnu_libc_version[32];
-+     // jio_snprintf(_gnu_libc_version, sizeof(_gnu_libc_version),
-+     //       "glibc %s %s", gnu_get_libc_version(), gnu_get_libc_release());
-+     static char _gnu_libc_version[32] = "2.12";
-      os::Linux::set_glibc_version(_gnu_libc_version);
-   }
-
-@@ -2434,10 +2434,8 @@
- // If we are running with earlier version, which did not have symbol versions,
- // we should use the base version.
- void* os::Linux::libnuma_dlsym(void* handle, const char *name) {
--  void *f = dlvsym(handle, name, "libnuma_1.1");
--  if (f == NULL) {
--    f = dlsym(handle, name);
--  }
-+  void *f;
-+  f = dlsym(handle, name);
-   return f;
- }
- 
-@@ -4446,7 +4444,21 @@
- // Linux doesn't yet have a (official) notion of processor sets,
- // so just return the system wide load average.
- int os::loadavg(double loadavg[], int nelem) {
--  return ::getloadavg(loadavg, nelem);
-+ FILE *LOADAVG;
-+ double avg[3] = { 0.0, 0.0, 0.0 };
-+ int i, res = -1;;
-+
-+ if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
-+ fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]);
-+ res = 0;
-+ fclose(LOADAVG);
-+ }
-+
-+ for (i = 0; (i < nelem) && (i < 3); i++) {
-+ loadavg[i] = avg[i];
-+ }
-+
-+ return res;
- }
- 
- void os::pause() {
-
---- w-openjdk-6-1.orig/openjdk-6/hotspot/make/linux/platform_zero.in	2011-02-28 17:03:13.000000000 +0100
-+++ w-openjdk-6-1/openjdk-6/hotspot/make/linux/platform_zero.in	2011-08-07 13:56:56.875281880 +0200
-@@ -14,4 +14,4 @@
- 
- gnu_dis_arch = zero
- 
--sysdefs = -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -D@ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\"
-+sysdefs = -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -D@ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\" -D__STDC_LIMIT_MACROS
-
---- w-openjdk-6-1.orig/openjdk-6/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	2011-02-28 17:03:22.000000000 +0100
-+++ w-openjdk-6-1/openjdk-6/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	2011-08-07 12:32:09.325489647 +0200
-@@ -238,7 +238,7 @@
- #endif
- inline int g_isnan(double f) { return isnand(f); }
- #elif LINUX
--inline int g_isnan(float  f) { return isnanf(f); }
-+inline int g_isnan(float  f) { return __isnanf(f); }
- inline int g_isnan(double f) { return isnan(f); }
- #else
- #error "missing platform-specific definition here"
-@@ -252,8 +252,8 @@
- 
- // Checking for finiteness
- 
--inline int g_isfinite(jfloat  f)                 { return finite(f); }
--inline int g_isfinite(jdouble f)                 { return finite(f); }
-+inline int g_isfinite(jfloat  f)                 { return isfinite(f); }
-+inline int g_isfinite(jdouble f)                 { return isfinite(f); }
- 
- 
- // Wide characters
-- 
cgit v1.2.3


From fd59a2dcbdc04281b10a8f4380f7a31f5b1afe78 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 8 Jan 2014 20:35:44 +0100
Subject: fix jpeg dependency

---
 package/php/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/php/Makefile b/package/php/Makefile
index fd72d9de5..43fd6554f 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -31,8 +31,8 @@ PKGFB_MOD_CURL:=	curl
 PKGFS_MOD_CURL:=	libcurl
 PKGFD_MOD_FTP:=		FTP support
 PKGFD_MOD_GD:=		Gd support
-PKGFB_MOD_GD:=		libgd libpng jpeg
-PKGFS_MOD_GD:=		libgd libpng libjpeg
+PKGFB_MOD_GD:=		libgd libpng libjpeg-turbo
+PKGFS_MOD_GD:=		libgd libpng libjpeg-turbo
 PKGFD_MOD_GMP:=		GMP support
 PKGFB_MOD_GMP:=		gmp
 PKGFS_MOD_GMP:=		libgmp
-- 
cgit v1.2.3


From 0a936812d615f9824bfbfa7958e04559b9dc7294 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 8 Jan 2014 20:38:06 +0100
Subject: remove LINUX_HEADER_DIR

---
 mk/vars.mk                        | 1 -
 package/iproute2/Makefile         | 2 +-
 package/libcap/Makefile           | 2 +-
 toolchain/kernel-headers/Makefile | 3 ---
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/mk/vars.mk b/mk/vars.mk
index 0525f5129..657d44ae5 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -136,7 +136,6 @@ FLAGS_FOR_BUILD=	${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD}
 PATCH=			${BASH} $(SCRIPT_DIR)/patch.sh
 SED:=			sed -i -e
 LINUX_DIR:=		$(BUILD_DIR)/linux
-LINUX_HEADER_DIR:=	$(STAGING_DIR)/linux-header
 KERNEL_MODULE_FLAGS:=	ARCH=${ARCH} KERNELVERSION="2.6" \
 			KERNEL_PATH=${LINUX_DIR} KERNELDIR=${LINUX_DIR} KERNEL_DIR=${LINUX_DIR} \
 			PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 4a894389f..33c33f7e7 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -47,7 +47,7 @@ $(eval $(call PKG_template,SS,ss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_SS},${PK
 CONFIG_STYLE:=		minimal
 TARGET_CFLAGS+=		-D_GNU_SOURCE
 XAKE_FLAGS+=		CCOPTS="${TARGET_CFLAGS}" MFLAGS="CC=\"${TARGET_CC}\"" \
-			CFLAGS_FOR_BUILD+="-I${LINUX_HEADER_DIR}/include"
+			CFLAGS_FOR_BUILD+="-I${LINUX_DIR}/include"
 CONFIGURE_ENV+=		CC="${TARGET_CC}" IPTC="${TARGET_CFLAGS}" IPTL="${TARGET_LDFLAGS}"
 
 ip-install:
diff --git a/package/libcap/Makefile b/package/libcap/Makefile
index 40ebae489..1e78082c4 100644
--- a/package/libcap/Makefile
+++ b/package/libcap/Makefile
@@ -20,7 +20,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBCAP,libcap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CPPFLAGS_FOR_BUILD+=	-I$(LINUX_HEADER_DIR)/include
+CPPFLAGS_FOR_BUILD+=	-I$(LINUX_DIR)/include
 CONFIG_STYLE:=		manual
 
 libcap-install:
diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 4346cb1a6..6ece517d3 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -10,9 +10,6 @@ $(WRKBUILD)/.headers:
 	$(MAKE) -C $(WRKBUILD) HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(STAGING_DIR)/usr \
 		headers_install
-	$(MAKE) -C $(WRKBUILD) HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \
-		INSTALL_HDR_PATH=$(LINUX_HEADER_DIR) \
-		headers_install
 ifeq ($(ARCH),cris)
 ifeq ($(CPU_ARCH),crisv32)
 	cd $(STAGING_DIR)/usr/include && ln -sf arch-v32/arch arch
-- 
cgit v1.2.3


From e276b89c4e18e975addf49f923e60a9e55e5216f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 8 Jan 2014 20:39:57 +0100
Subject: do not build jtools by default, oops

---
 jtools/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jtools/Makefile b/jtools/Makefile
index 39143976b..23d93a6d4 100644
--- a/jtools/Makefile
+++ b/jtools/Makefile
@@ -3,8 +3,11 @@
 
 include $(TOPDIR)/rules.mk
 
+TARGETS:=
 # jikes is for ant
+ifneq ($(ADK_PACKAGE_OPENJDK7),)
 TARGETS:=fastjar gcj ecj jikes classpath jamvm ant openjdk7
+endif
 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
-- 
cgit v1.2.3


From 1260f8dbf14a1b4edd3b7f37cd7b020f88b3a654 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 8 Jan 2014 21:00:58 +0100
Subject: try to fix compile

---
 package/qingy/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/qingy/Makefile b/package/qingy/Makefile
index f0739a9f5..381d252d8 100644
--- a/package/qingy/Makefile
+++ b/package/qingy/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		qingy
 PKG_VERSION:=		1.0.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		1e0912655e240adfd0ce5ced30bbc685
 PKG_DESCR:=		a DirectFB getty replacement
 PKG_SECTION:=		misc
@@ -21,6 +21,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,QINGY,qingy,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_LDFLAGS+=	-ltinfo
 CONFIGURE_ARGS+=	--disable-screen-savers \
 			--disable-optimizations \
 			--disable-pam \
-- 
cgit v1.2.3