diff options
Diffstat (limited to 'recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-ecj-fix-zlib.patch')
-rw-r--r-- | recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-ecj-fix-zlib.patch | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-ecj-fix-zlib.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-ecj-fix-zlib.patch deleted file mode 100644 index eff7e48..0000000 --- a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-ecj-fix-zlib.patch +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | Index: openjdk/jdk/make/com/sun/java/pack/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2009-09-29 13:48:34.538565136 +0200 | ||
4 | +++ openjdk/jdk/make/com/sun/java/pack/Makefile 2009-09-29 14:00:26.226565853 +0200 | ||
5 | @@ -80,7 +80,7 @@ | ||
6 | OTHER_LDLIBS += $(JVMLIB) | ||
7 | endif | ||
8 | |||
9 | -OTHER_LDLIBS += -lz | ||
10 | +OTHER_LDLIBS += -L$(libdir) -lz | ||
11 | CXXFLAGS_DBG += -DFULL | ||
12 | CXXFLAGS_OPT += -DPRODUCT | ||
13 | CXXFLAGS_COMMON += -DFULL | ||
14 | Index: openjdk/jdk/make/common/Defs.gmk | ||
15 | =================================================================== | ||
16 | --- openjdk.orig/jdk/make/common/Defs.gmk 2009-09-29 13:57:14.450815511 +0200 | ||
17 | +++ openjdk/jdk/make/common/Defs.gmk 2009-09-29 14:00:26.226565853 +0200 | ||
18 | @@ -289,7 +289,7 @@ | ||
19 | |||
20 | endif # PROGRAM | ||
21 | |||
22 | -LDLIBS_COMMON += $(EXTRA_LIBS) | ||
23 | +LDLIBS_COMMON += $(EXTRA_LIBS) -L$(libdir) | ||
24 | |||
25 | # | ||
26 | # Default is to build, not import native binaries | ||
27 | @@ -425,7 +425,7 @@ | ||
28 | CLASSDESTDIR = $(CLASSBINDIR) | ||
29 | endif | ||
30 | |||
31 | -INCLUDES = -I. -I$(CLASSHDRDIR) \ | ||
32 | +INCLUDES = -I$(includedir) -I. -I$(CLASSHDRDIR) \ | ||
33 | $(patsubst %,-I%,$(subst $(CLASSPATH_SEPARATOR), ,$(VPATH.h))) $(OTHER_INCLUDES) | ||
34 | OTHER_CPPFLAGS = $(INCLUDES) | ||
35 | |||
36 | Index: openjdk/jdk/make/common/Program.gmk | ||
37 | =================================================================== | ||
38 | --- openjdk.orig/jdk/make/common/Program.gmk 2009-09-29 13:48:33.914565255 +0200 | ||
39 | +++ openjdk/jdk/make/common/Program.gmk 2009-09-29 14:00:26.226565853 +0200 | ||
40 | @@ -73,7 +73,7 @@ | ||
41 | # itself, as with all the Windows libraries. | ||
42 | # | ||
43 | ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems | ||
44 | - LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli | ||
45 | + LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli -L $(libdir) | ||
46 | OTHER_LDLIBS += -ljli | ||
47 | ifeq ($(PLATFORM), solaris) | ||
48 | ifeq ($(ARCH_DATA_MODEL), 32) | ||
49 | Index: openjdk/jdk/make/java/jli/Makefile | ||
50 | =================================================================== | ||
51 | --- openjdk.orig/jdk/make/java/jli/Makefile 2009-09-29 13:48:33.806565054 +0200 | ||
52 | +++ openjdk/jdk/make/java/jli/Makefile 2009-09-29 14:00:26.230565844 +0200 | ||
53 | @@ -61,7 +61,7 @@ | ||
54 | ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems | ||
55 | LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/jli | ||
56 | # Guarantee very limited dependencies | ||
57 | - LDLIBS = -lz -lc | ||
58 | + LDLIBS = -L$(libdir) -lz -lc | ||
59 | endif | ||
60 | |||
61 | ifeq ($(PLATFORM), windows) | ||