diff options
author | Henning Heinold <h.heinold@tarent.de> | 2010-07-12 13:29:16 +0200 |
---|---|---|
committer | Henning Heinold <h.heinold@tarent.de> | 2010-08-02 10:23:46 +0200 |
commit | b78fc95424b5f0fb28246e8c61bb8b4d6a9d733a (patch) | |
tree | f65f5609aabafe474f1f35bb7e284aa733be1081 /recipes/openjdk/openjdk-6-6b18-1.8/icedtea-jdk-iconv-uclibc.patch | |
parent | 9e043b45ceba7e65565722c7dc14910547b04d17 (diff) | |
download | openembedded-b78fc95424b5f0fb28246e8c61bb8b4d6a9d733a.tar.gz |
openjdk: backport from openembedded-devstable/2009
Acked-by: Stefan Schmidt <stefan@buglabs.net>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Diffstat (limited to 'recipes/openjdk/openjdk-6-6b18-1.8/icedtea-jdk-iconv-uclibc.patch')
-rw-r--r-- | recipes/openjdk/openjdk-6-6b18-1.8/icedtea-jdk-iconv-uclibc.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/recipes/openjdk/openjdk-6-6b18-1.8/icedtea-jdk-iconv-uclibc.patch b/recipes/openjdk/openjdk-6-6b18-1.8/icedtea-jdk-iconv-uclibc.patch new file mode 100644 index 0000000000..68f858167f --- /dev/null +++ b/recipes/openjdk/openjdk-6-6b18-1.8/icedtea-jdk-iconv-uclibc.patch @@ -0,0 +1,39 @@ +Index: openjdk/jdk/make/java/npt/Makefile +=================================================================== +--- openjdk/jdk/make/java/npt/Makefile 2010-06-13 15:11:02.598512448 +0200 ++++ openjdk/jdk/make/java/npt/Makefile 2010-06-13 15:11:28.504759286 +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 +Index: icedtea6-1.8/openjdk-ecj/jdk/make/java/instrument/Makefile +=================================================================== +--- openjdk/jdk/make/java/instrument/Makefile 2010-06-13 15:12:14.688505195 +0200 ++++ openjdk/jdk/make/java/instrument/Makefile 2010-06-13 15:12:32.641425670 +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 + # +Index: openjdk/jdk/make/sun/splashscreen/Makefile +=================================================================== +--- openjdk/jdk/make/sun/splashscreen/Makefile 2010-06-13 15:12:48.951840824 +0200 ++++ openjdk/jdk/make/sun/splashscreen/Makefile 2010-06-13 15:13:01.191422891 +0200 +@@ -55,6 +55,8 @@ + + JAVALIB= + ++LDLIBS += -liconv ++ + # + # C Flags + # |