diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-17 12:51:22 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-17 12:51:22 +0100 |
| commit | 9f02979caebb6e900fe101a257d8e6c344a7a173 (patch) | |
| tree | 350b808ae23e8abb4ff08d472b76104a89e1f35a /jtools/openjdk/patches/iconv.patch | |
| parent | afb9908771db100ee97bb933fcca850c4f49af5a (diff) | |
| parent | ee3c54b1570b9dd8ea900a11d496ced1ad1ae356 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'jtools/openjdk/patches/iconv.patch')
| -rw-r--r-- | jtools/openjdk/patches/iconv.patch | 36 |
1 files changed, 36 insertions, 0 deletions
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 + # |