diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-22 06:26:27 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-22 06:26:27 +0200 |
| commit | 90f063cdaa362277b19eac3d3e3ebeb6227b4da3 (patch) | |
| tree | 58f05de6554dd97a6afffada929aa5402dab2117 /package/openjdk/patches/iconv.patch | |
| parent | f41e4877defd5be85457121c5fd9b923a943d8ed (diff) | |
| parent | 432ae1a94f4d543da3aa2ed226cd3c00e350e3c4 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/openjdk/patches/iconv.patch')
| -rw-r--r-- | package/openjdk/patches/iconv.patch | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/package/openjdk/patches/iconv.patch b/package/openjdk/patches/iconv.patch index 16a6946f6..b79971930 100644 --- a/package/openjdk/patches/iconv.patch +++ b/package/openjdk/patches/iconv.patch @@ -1,17 +1,6 @@ -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 + + add required linker flags. + --- 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 @@ @@ -23,7 +12,6 @@ diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/java/instrument/Makefile w-openjdk # # 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 @@ @@ -35,7 +23,6 @@ diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/java/npt/Makefile w-openjdk-6/open # 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 @@ |