blob: 67812253a119211d45e3517ab489368e879712d3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
--- 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
|
