summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-iconv-uclibc.patch
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2012-11-22 18:44:06 +0100
committerHenning Heinold <heinold@inf.fu-berlin.de>2012-11-22 18:44:06 +0100
commite6e59540e4540dfca17c5904aad6fdc23cf6934e (patch)
treec72bc47a8726d3f7ef782402eb1fe2d0beade43b /recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-iconv-uclibc.patch
parent8ef1ab1273b331d0d39bcfc24a1fe80d77a588c7 (diff)
downloadmeta-java-e6e59540e4540dfca17c5904aad6fdc23cf6934e.tar.gz
openjdk7: copy over the openjdk7 from openjdk7-branch
The branches differed to much and I wanted to keep openjdk-6. We will loose some history, but I think that is not a great problem Thanks to khem for working on the recipes too.
Diffstat (limited to 'recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-iconv-uclibc.patch')
-rw-r--r--recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-iconv-uclibc.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-iconv-uclibc.patch b/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-iconv-uclibc.patch
new file mode 100644
index 0000000..68f8581
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-iconv-uclibc.patch
@@ -0,0 +1,39 @@
1Index: openjdk/jdk/make/java/npt/Makefile
2===================================================================
3--- openjdk/jdk/make/java/npt/Makefile 2010-06-13 15:11:02.598512448 +0200
4+++ openjdk/jdk/make/java/npt/Makefile 2010-06-13 15:11:28.504759286 +0200
5@@ -65,6 +65,8 @@
6 # We don't want to link against -ljava
7 JAVALIB=
8
9+LDLIBS += -liconv
10+
11 # Add -export options to explicitly spell exported symbols
12 ifeq ($(PLATFORM), windows)
13 OTHER_LCF += -export:nptInitialize -export:nptTerminate
14Index: icedtea6-1.8/openjdk-ecj/jdk/make/java/instrument/Makefile
15===================================================================
16--- openjdk/jdk/make/java/instrument/Makefile 2010-06-13 15:12:14.688505195 +0200
17+++ openjdk/jdk/make/java/instrument/Makefile 2010-06-13 15:12:32.641425670 +0200
18@@ -123,6 +123,8 @@
19 # We don't want to link against -ljava
20 JAVALIB=
21
22+LDLIBS += -liconv
23+
24 #
25 # Add to ambient vpath so we pick up the library files
26 #
27Index: openjdk/jdk/make/sun/splashscreen/Makefile
28===================================================================
29--- openjdk/jdk/make/sun/splashscreen/Makefile 2010-06-13 15:12:48.951840824 +0200
30+++ openjdk/jdk/make/sun/splashscreen/Makefile 2010-06-13 15:13:01.191422891 +0200
31@@ -55,6 +55,8 @@
32
33 JAVALIB=
34
35+LDLIBS += -liconv
36+
37 #
38 # C Flags
39 #