iconv.patch 2.0 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849
  1. 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
  2. --- w-openjdk-6.orig/openjdk-6/hotspot/make/linux/makefiles/gcc.make 2011-02-28 17:03:13.000000000 +0100
  3. +++ w-openjdk-6/openjdk-6/hotspot/make/linux/makefiles/gcc.make 2011-04-11 18:36:16.837665258 +0200
  4. @@ -108,9 +108,6 @@
  5. CFLAGS += -pipe
  6. endif
  7. -# Compiler warnings are treated as errors
  8. -WARNINGS_ARE_ERRORS = -Werror
  9. -
  10. # Except for a few acceptable ones
  11. # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
  12. # conversions which might affect the values. To avoid that, we need to turn
  13. diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/java/instrument/Makefile w-openjdk-6/openjdk-6/jdk/make/java/instrument/Makefile
  14. --- w-openjdk-6.orig/openjdk-6/jdk/make/java/instrument/Makefile 2011-02-28 17:06:10.000000000 +0100
  15. +++ w-openjdk-6/openjdk-6/jdk/make/java/instrument/Makefile 2011-04-11 23:14:27.571411016 +0200
  16. @@ -123,6 +123,8 @@
  17. # We don't want to link against -ljava
  18. JAVALIB=
  19. +LDLIBS += -liconv
  20. +
  21. #
  22. # Add to ambient vpath so we pick up the library files
  23. #
  24. diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/java/npt/Makefile w-openjdk-6/openjdk-6/jdk/make/java/npt/Makefile
  25. --- w-openjdk-6.orig/openjdk-6/jdk/make/java/npt/Makefile 2011-02-28 17:06:11.000000000 +0100
  26. +++ w-openjdk-6/openjdk-6/jdk/make/java/npt/Makefile 2011-04-11 23:14:07.017670197 +0200
  27. @@ -65,6 +65,8 @@
  28. # We don't want to link against -ljava
  29. JAVALIB=
  30. +LDLIBS += -liconv
  31. +
  32. # Add -export options to explicitly spell exported symbols
  33. ifeq ($(PLATFORM), windows)
  34. OTHER_LCF += -export:nptInitialize -export:nptTerminate
  35. diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/sun/splashscreen/Makefile w-openjdk-6/openjdk-6/jdk/make/sun/splashscreen/Makefile
  36. --- w-openjdk-6.orig/openjdk-6/jdk/make/sun/splashscreen/Makefile 2011-02-28 17:06:12.000000000 +0100
  37. +++ w-openjdk-6/openjdk-6/jdk/make/sun/splashscreen/Makefile 2011-04-11 23:15:07.221411030 +0200
  38. @@ -55,6 +55,8 @@
  39. JAVALIB=
  40. +LDLIBS += -liconv
  41. +
  42. #
  43. # C Flags
  44. #