diff options
author | Henning Heinold <heinold@inf.fu-berlin.de> | 2011-11-12 20:58:34 +0100 |
---|---|---|
committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2011-11-26 23:41:44 +0100 |
commit | 57e069cde6617f00ca8834a82c6f360af43d5067 (patch) | |
tree | 48cbe15e96d217c45acfa64b0c13aad8c6424980 /recipes-core/openjdk/openjdk-6/icedtea-jdk-iconv-uclibc.patch | |
download | meta-java-57e069cde6617f00ca8834a82c6f360af43d5067.tar.gz |
meta-java: initial commit
* taken over mostly stuff from oe classic
* cleaned up recipes
* added license checksums
* bump icedtea6-native to 1.8.11
* use jamvm from git as native
Diffstat (limited to 'recipes-core/openjdk/openjdk-6/icedtea-jdk-iconv-uclibc.patch')
-rw-r--r-- | recipes-core/openjdk/openjdk-6/icedtea-jdk-iconv-uclibc.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-jdk-iconv-uclibc.patch b/recipes-core/openjdk/openjdk-6/icedtea-jdk-iconv-uclibc.patch new file mode 100644 index 0000000..68f8581 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6/icedtea-jdk-iconv-uclibc.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | Index: 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 | ||
14 | Index: 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 | # | ||
27 | Index: 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 | # | ||