make it compile with eglibc (without libnsl/backtrace support)

2 files changed, 80 insertions, 0 deletions

diff --git a/package/openjdk/patches/disable-backtrace.patch b/package/openjdk/patches/disable-backtrace.patch
new file mode 100644
index 000000000..bd335a914
--- /dev/null
+++ b/package/openjdk/patches/disable-backtrace.patch
@@ -0,0 +1,11 @@
+--- w-openjdk-6-1.orig/openjdk-6/jdk/src/solaris/native/sun/xawt/XToolkit.c	2011-02-28 17:06:50.000000000 +0100
++++ w-openjdk-6-1/openjdk-6/jdk/src/solaris/native/sun/xawt/XToolkit.c	2011-04-10 22:33:28.481412674 +0200
+@@ -689,7 +689,7 @@
+     return ret;
+ }
+ 
+-#ifdef __linux__
++#if 0
+ void print_stack(void)
+ {
+   void *array[10];
diff --git a/package/openjdk/patches/remove-libnsl.patch b/package/openjdk/patches/remove-libnsl.patch
new file mode 100644
index 000000000..9c086843e
--- /dev/null
+++ b/package/openjdk/patches/remove-libnsl.patch
@@ -0,0 +1,69 @@
+--- w-openjdk-6-1.orig/openjdk-6/jdk/make/java/hpi/hpi_common.gmk	2011-02-28 17:06:10.000000000 +0100
++++ w-openjdk-6-1/openjdk-6/jdk/make/java/hpi/hpi_common.gmk	2011-04-10 20:05:01.417672476 +0200
+@@ -86,5 +86,5 @@
+ # Things that must be linked in.
+ #
+ ifneq ($(PLATFORM), windows)
+-OTHER_LDLIBS += $(LIBSOCKET) -lnsl $(LIBM) -ldl
++OTHER_LDLIBS += $(LIBSOCKET) $(LIBM) -ldl
+ endif
+--- w-openjdk-6-1.orig/openjdk-6/jdk/make/java/java/Makefile	2011-02-28 17:06:10.000000000 +0100
++++ w-openjdk-6-1/openjdk-6/jdk/make/java/java/Makefile	2011-04-10 20:05:20.637673621 +0200
+@@ -205,7 +205,7 @@
+ OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \
+ 		       -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib
+ else
+-OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -lnsl -ldl \
++OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -ldl \
+ 		-L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH)
+ endif
+ 
+--- w-openjdk-6-1.orig/openjdk-6/jdk/make/java/net/Makefile	2011-02-28 17:06:10.000000000 +0100
++++ w-openjdk-6-1/openjdk-6/jdk/make/java/net/Makefile	2011-04-10 20:05:39.537672169 +0200
+@@ -97,7 +97,7 @@
+   # Will not compile at warning level 3 if warnings are fatal
+   COMPILER_WARNINGS_FATAL=false
+ else
+-  OTHER_LDLIBS = $(LIBSOCKET) -lnsl -ldl $(JVMLIB)
++  OTHER_LDLIBS = $(LIBSOCKET) -ldl $(JVMLIB)
+ endif
+ ifeq ($(PLATFORM), linux)
+   OTHER_LDLIBS += -lpthread
+--- w-openjdk-6-1.orig/openjdk-6/jdk/make/jpda/transport/socket/Makefile	2011-02-28 17:06:11.000000000 +0100
++++ w-openjdk-6-1/openjdk-6/jdk/make/jpda/transport/socket/Makefile	2011-04-10 20:06:06.037672449 +0200
+@@ -42,11 +42,11 @@
+ endif
+ 
+ ifeq ($(PLATFORM), linux)
+-  OTHER_LDLIBS += -lnsl $(LIBSOCKET) -lpthread
++  OTHER_LDLIBS += $(LIBSOCKET) -lpthread
+ endif
+ 
+ ifeq ($(PLATFORM), solaris)
+-  OTHER_LDLIBS += -lnsl $(LIBSOCKET)
++  OTHER_LDLIBS += $(LIBSOCKET)
+ endif
+ 
+ ifeq ($(PLATFORM), windows)
+--- w-openjdk-6-1.orig/openjdk-6/jdk/make/java/java_hprof_demo/Makefile	2011-02-28 17:06:10.000000000 +0100
++++ w-openjdk-6-1/openjdk-6/jdk/make/java/java_hprof_demo/Makefile	2011-04-10 20:28:43.287672398 +0200
+@@ -83,7 +83,7 @@
+ ifeq ($(PLATFORM), windows)
+   OTHER_LDLIBS += wsock32.lib winmm.lib
+ else
+-  OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl
++  OTHER_LDLIBS += $(LIBSOCKET) -ldl
+ endif
+ 
+ #
+--- w-openjdk-6-1.orig/openjdk-6/jdk/make/mkdemo/jvmti/hprof/Makefile	2011-02-28 17:06:11.000000000 +0100
++++ w-openjdk-6-1/openjdk-6/jdk/make/mkdemo/jvmti/hprof/Makefile	2011-04-11 10:23:11.538911604 +0200
+@@ -42,7 +42,7 @@
+   OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl
+ endif
+ ifeq ($(PLATFORM), linux)
+-  OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl -lpthread
++  OTHER_LDLIBS += $(LIBSOCKET) -ldl -lpthread
+ endif
+ 
+ #