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

---
 package/openjdk/patches/cxxflags-nozlib.patch | 31 ---------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 package/openjdk/patches/cxxflags-nozlib.patch

(limited to 'package/openjdk/patches/cxxflags-nozlib.patch')

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
-- 
cgit v1.2.3