diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-27 10:27:09 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-27 10:27:09 +0200 |
| commit | 63c6929d36e5b5802c0983932a3d69e23f330bb5 (patch) | |
| tree | 57de1bd67fa01fb35ced66d8907fd926c66adfe5 /package/openjdk | |
| parent | c4ef12b64426763670dcae46219b766ba2f490cd (diff) | |
fix allconfig for foxg20
Diffstat (limited to 'package/openjdk')
| -rw-r--r-- | package/openjdk/Makefile | 2 | ||||
| -rw-r--r-- | package/openjdk/patches/iconv.patch | 49 |
2 files changed, 51 insertions, 0 deletions
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index 8d0da3e2c..08d80e4c4 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -24,6 +24,8 @@ PKG_SITES:= http://download.java.net/openjdk/jdk6/promoted/b22/ \ http://icedtea.classpath.org/download/drops/ \ http://icedtea.classpath.org/download/source/ +PKG_CFLINE_OPENJDK:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC + # autotools infrastructure for OpenJDK ICEDTEA_NAME:= icedtea6 ICEDTEA_VERSION:= 1.10 diff --git a/package/openjdk/patches/iconv.patch b/package/openjdk/patches/iconv.patch new file mode 100644 index 000000000..16a6946f6 --- /dev/null +++ b/package/openjdk/patches/iconv.patch @@ -0,0 +1,49 @@ +diff -Nur w-openjdk-6.orig/openjdk-6/hotspot/make/linux/makefiles/gcc.make w-openjdk-6/openjdk-6/hotspot/make/linux/makefiles/gcc.make +--- w-openjdk-6.orig/openjdk-6/hotspot/make/linux/makefiles/gcc.make 2011-02-28 17:03:13.000000000 +0100 ++++ w-openjdk-6/openjdk-6/hotspot/make/linux/makefiles/gcc.make 2011-04-11 18:36:16.837665258 +0200 +@@ -108,9 +108,6 @@ + CFLAGS += -pipe + endif + +-# Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror +- + # Except for a few acceptable ones + # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit + # conversions which might affect the values. To avoid that, we need to turn +diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/java/instrument/Makefile w-openjdk-6/openjdk-6/jdk/make/java/instrument/Makefile +--- 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 + # +diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/java/npt/Makefile w-openjdk-6/openjdk-6/jdk/make/java/npt/Makefile +--- 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 +diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/sun/splashscreen/Makefile w-openjdk-6/openjdk-6/jdk/make/sun/splashscreen/Makefile +--- 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 + # |