From 713dc7012af249b7102faabb27e0fe88ea39be57 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 10 Nov 2011 19:03:11 +0100
Subject: fix make bulk on OpenADK buildserver

---
 jtools/openjdk/patches/iconv.patch | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 jtools/openjdk/patches/iconv.patch

(limited to 'jtools/openjdk/patches/iconv.patch')

diff --git a/jtools/openjdk/patches/iconv.patch b/jtools/openjdk/patches/iconv.patch
new file mode 100644
index 000000000..c607d2195
--- /dev/null
+++ b/jtools/openjdk/patches/iconv.patch
@@ -0,0 +1,36 @@
+
+ add required linker flags.
+
+--- openjdk-6.orig/jdk/make/java/instrument/Makefile	2011-02-28 17:06:10.000000000 +0100
++++ 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
+ #
+--- openjdk-6.orig/jdk/make/java/npt/Makefile	2011-02-28 17:06:11.000000000 +0100
++++ 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
+--- openjdk-6.orig/jdk/make/sun/splashscreen/Makefile	2011-02-28 17:06:12.000000000 +0100
++++ openjdk-6/jdk/make/sun/splashscreen/Makefile	2011-04-11 23:15:07.221411030 +0200
+@@ -55,6 +55,8 @@
+ 
+ JAVALIB=
+ 
++LDLIBS += -liconv
++
+ #
+ # C Flags
+ #
-- 
cgit v1.2.3