blob: b79971930405b4a87834fece3c826cb25707ea45 (
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
32
33
34
35
36
|
add required linker flags.
--- w-openjdk-6.orig/openjdk-6/jdk/make/java/instrument/Makefile 2011-02-28 17:06:10.000000000 +0100
+++ w-openjdk-6/openjdk-6/jdk/make/java/instrument/Makefile 2011-04-11 23:14:27.571411016 +0200
@@ -123,6 +123,8 @@
# We don't want to link against -ljava
JAVALIB=
+LDLIBS += -liconv
+
#
# Add to ambient vpath so we pick up the library files
#
--- w-openjdk-6.orig/openjdk-6/jdk/make/java/npt/Makefile 2011-02-28 17:06:11.000000000 +0100
+++ w-openjdk-6/openjdk-6/jdk/make/java/npt/Makefile 2011-04-11 23:14:07.017670197 +0200
@@ -65,6 +65,8 @@
# We don't want to link against -ljava
JAVALIB=
+LDLIBS += -liconv
+
# Add -export options to explicitly spell exported symbols
ifeq ($(PLATFORM), windows)
OTHER_LCF += -export:nptInitialize -export:nptTerminate
--- w-openjdk-6.orig/openjdk-6/jdk/make/sun/splashscreen/Makefile 2011-02-28 17:06:12.000000000 +0100
+++ w-openjdk-6/openjdk-6/jdk/make/sun/splashscreen/Makefile 2011-04-11 23:15:07.221411030 +0200
@@ -55,6 +55,8 @@
JAVALIB=
+LDLIBS += -liconv
+
#
# C Flags
#
|
