diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-08 21:24:00 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-08 21:24:00 +0100 |
| commit | 00cbc2bacb89b125b3ed447631cf84e892bb4b77 (patch) | |
| tree | 672615fa6be75e9f3262bcb1beafd7a138f425a4 /package/openjdk/patches/iconv.patch | |
| parent | c29d4fda23a138b713591709ca5ee15c096d467d (diff) | |
| parent | 1260f8dbf14a1b4edd3b7f37cd7b020f88b3a654 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/openjdk/patches/iconv.patch')
| -rw-r--r-- | package/openjdk/patches/iconv.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/package/openjdk/patches/iconv.patch b/package/openjdk/patches/iconv.patch deleted file mode 100644 index b79971930..000000000 --- a/package/openjdk/patches/iconv.patch +++ /dev/null @@ -1,36 +0,0 @@ - - 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 - # |