iconv.patch 1001 B

123456789101112131415161718192021222324252627282930313233343536
  1. add required linker flags.
  2. --- openjdk-6.orig/jdk/make/java/instrument/Makefile 2011-02-28 17:06:10.000000000 +0100
  3. +++ openjdk-6/jdk/make/java/instrument/Makefile 2011-04-11 23:14:27.571411016 +0200
  4. @@ -123,6 +123,8 @@
  5. # We don't want to link against -ljava
  6. JAVALIB=
  7. +LDLIBS += -liconv
  8. +
  9. #
  10. # Add to ambient vpath so we pick up the library files
  11. #
  12. --- openjdk-6.orig/jdk/make/java/npt/Makefile 2011-02-28 17:06:11.000000000 +0100
  13. +++ openjdk-6/jdk/make/java/npt/Makefile 2011-04-11 23:14:07.017670197 +0200
  14. @@ -65,6 +65,8 @@
  15. # We don't want to link against -ljava
  16. JAVALIB=
  17. +LDLIBS += -liconv
  18. +
  19. # Add -export options to explicitly spell exported symbols
  20. ifeq ($(PLATFORM), windows)
  21. OTHER_LCF += -export:nptInitialize -export:nptTerminate
  22. --- openjdk-6.orig/jdk/make/sun/splashscreen/Makefile 2011-02-28 17:06:12.000000000 +0100
  23. +++ openjdk-6/jdk/make/sun/splashscreen/Makefile 2011-04-11 23:15:07.221411030 +0200
  24. @@ -55,6 +55,8 @@
  25. JAVALIB=
  26. +LDLIBS += -liconv
  27. +
  28. #
  29. # C Flags
  30. #