jtools/openjdk/patches/remove-libnsl.patch

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