remove-libnsl.patch 2.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172
  1. remove libnsl from linking.
  2. --- w-openjdk-6-1.orig/openjdk-6/jdk/make/java/hpi/hpi_common.gmk 2011-02-28 17:06:10.000000000 +0100
  3. +++ w-openjdk-6-1/openjdk-6/jdk/make/java/hpi/hpi_common.gmk 2011-04-10 20:05:01.417672476 +0200
  4. @@ -86,5 +86,5 @@
  5. # Things that must be linked in.
  6. #
  7. ifneq ($(PLATFORM), windows)
  8. -OTHER_LDLIBS += $(LIBSOCKET) -lnsl $(LIBM) -ldl
  9. +OTHER_LDLIBS += $(LIBSOCKET) $(LIBM) -ldl
  10. endif
  11. --- w-openjdk-6-1.orig/openjdk-6/jdk/make/java/java/Makefile 2011-02-28 17:06:10.000000000 +0100
  12. +++ w-openjdk-6-1/openjdk-6/jdk/make/java/java/Makefile 2011-04-10 20:05:20.637673621 +0200
  13. @@ -205,7 +205,7 @@
  14. OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \
  15. -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib
  16. else
  17. -OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -lnsl -ldl \
  18. +OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -ldl \
  19. -L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH)
  20. endif
  21. --- w-openjdk-6-1.orig/openjdk-6/jdk/make/java/net/Makefile 2011-02-28 17:06:10.000000000 +0100
  22. +++ w-openjdk-6-1/openjdk-6/jdk/make/java/net/Makefile 2011-04-10 20:05:39.537672169 +0200
  23. @@ -97,7 +97,7 @@
  24. # Will not compile at warning level 3 if warnings are fatal
  25. COMPILER_WARNINGS_FATAL=false
  26. else
  27. - OTHER_LDLIBS = $(LIBSOCKET) -lnsl -ldl $(JVMLIB)
  28. + OTHER_LDLIBS = $(LIBSOCKET) -ldl $(JVMLIB)
  29. endif
  30. ifeq ($(PLATFORM), linux)
  31. OTHER_LDLIBS += -lpthread
  32. --- w-openjdk-6-1.orig/openjdk-6/jdk/make/jpda/transport/socket/Makefile 2011-02-28 17:06:11.000000000 +0100
  33. +++ w-openjdk-6-1/openjdk-6/jdk/make/jpda/transport/socket/Makefile 2011-04-10 20:06:06.037672449 +0200
  34. @@ -42,11 +42,11 @@
  35. endif
  36. ifeq ($(PLATFORM), linux)
  37. - OTHER_LDLIBS += -lnsl $(LIBSOCKET) -lpthread
  38. + OTHER_LDLIBS += $(LIBSOCKET) -lpthread
  39. endif
  40. ifeq ($(PLATFORM), solaris)
  41. - OTHER_LDLIBS += -lnsl $(LIBSOCKET)
  42. + OTHER_LDLIBS += $(LIBSOCKET)
  43. endif
  44. ifeq ($(PLATFORM), windows)
  45. --- w-openjdk-6-1.orig/openjdk-6/jdk/make/java/java_hprof_demo/Makefile 2011-02-28 17:06:10.000000000 +0100
  46. +++ w-openjdk-6-1/openjdk-6/jdk/make/java/java_hprof_demo/Makefile 2011-04-10 20:28:43.287672398 +0200
  47. @@ -83,7 +83,7 @@
  48. ifeq ($(PLATFORM), windows)
  49. OTHER_LDLIBS += wsock32.lib winmm.lib
  50. else
  51. - OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl
  52. + OTHER_LDLIBS += $(LIBSOCKET) -ldl
  53. endif
  54. #
  55. --- w-openjdk-6-1.orig/openjdk-6/jdk/make/mkdemo/jvmti/hprof/Makefile 2011-02-28 17:06:11.000000000 +0100
  56. +++ w-openjdk-6-1/openjdk-6/jdk/make/mkdemo/jvmti/hprof/Makefile 2011-04-11 10:23:11.538911604 +0200
  57. @@ -42,7 +42,7 @@
  58. OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl
  59. endif
  60. ifeq ($(PLATFORM), linux)
  61. - OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl -lpthread
  62. + OTHER_LDLIBS += $(LIBSOCKET) -ldl -lpthread
  63. endif
  64. #