diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-10 15:22:22 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-10 15:22:22 +0100 |
| commit | 51ef23fb3b2a262ffa4a6b305fd76aaa9a3b1da1 (patch) | |
| tree | e5b251f3082a619bbc01ae3523cafe776569e4f6 /package/openjdk/patches/cxxflags-nozlib.patch | |
| parent | f3e1c3cf993b0ba54afa0ff9552ffefd39828b23 (diff) | |
| parent | 435cff735f24278f53678abda61b950a4a478895 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/openjdk/patches/cxxflags-nozlib.patch')
| -rw-r--r-- | package/openjdk/patches/cxxflags-nozlib.patch | 31 |
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 |