summaryrefslogtreecommitdiff
path: root/package/openjdk/patches/cxxflags-nozlib.patch
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-01-08 20:35:03 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-01-08 20:35:03 +0100
commit876f2127a4bcf6d2b623ce2070e3f082da58e3c5 (patch)
treeb5c5e648e0616f23eca12bc95aebf74b9e2fafea /package/openjdk/patches/cxxflags-nozlib.patch
parent28179a5675f9f8c417d416c71d2c4d1fbdeae299 (diff)
remove openjdk6
Diffstat (limited to 'package/openjdk/patches/cxxflags-nozlib.patch')
-rw-r--r--package/openjdk/patches/cxxflags-nozlib.patch31
1 files changed, 0 insertions, 31 deletions
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