Build completed JDK1.4 on -CURRENT!

[Elliot Dierksen]

Hello again!

I finally managed to get JDK 1.4 compiled on -CURRENT. Here is a context diff
of the hacks I made to the source and make files. I also had to link the java
plugin by hand so that mozilla would find it.

ln -s /usr/local/jdk1.4.1/jre/plugin/i386/ns600/libjavaplugin_oji.so \
	/usr/X11R6/lib/mozilla/plugins

Diff is attached. I haven't done any real testing yet other than to see that
mozilla knows about the plugin. I hope this helps!!!

Later,

EBD
-- 
Elliot Dierksen          "They that can give up essential liberty to
                          obtain a little temporary safety deserve
                          neither liberty nor safety" -- Benjamin Franklin
-------------- next part --------------
diff -cr work/j2se/ext/plugin/build/solaris/GNUmakefile work-hack/j2se/ext/plugin/build/solaris/GNUmakefile
*** work/j2se/ext/plugin/build/solaris/GNUmakefile	Sat Sep 13 12:31:55 2003
--- work-hack/j2se/ext/plugin/build/solaris/GNUmakefile	Sat Sep 13 12:11:32 2003
***************
*** 134,140 ****
  PLATFORM_LIBS= -lawt
  #Used to build the java_vm command
  #EXTRA_LIBS=-lpthread -ljvm -ljava -lawt -lm -ldl -lXt -lX11 -lmlib_image -lverify
! EXTRA_LIBS= -lpthread -ldl -lc
  
  GCC=$(CXX)
  GCCLD_SHARELIB_FLAG=$(LD_SHARELIB_FLAG)
--- 134,140 ----
  PLATFORM_LIBS= -lawt
  #Used to build the java_vm command
  #EXTRA_LIBS=-lpthread -ljvm -ljava -lawt -lm -ldl -lXt -lX11 -lmlib_image -lverify
! EXTRA_LIBS= -ldl -lc
  
  GCC=$(CXX)
  GCCLD_SHARELIB_FLAG=$(LD_SHARELIB_FLAG)
***************
*** 184,190 ****
  LD_SHARELIB_FLAG=-shared
  PLATFORM_LIBS=-L$(JAVALIB) -lawt$(DBG)
  # native_threads libhpi.so can be safely loaded at runtime.
! EXTRA_LIBS=-pthread
  # green threads libhpi.so must be loaded at link time due to libc issues.
  GREEN_EXTRA_LIBS=-L$(JAVALIB)/green_threads -lhpi$(DBG)
  EXTRA_CFLAGS=-I$(INTL_INCLUDE) -D_BSD_SOURCE
--- 184,190 ----
  LD_SHARELIB_FLAG=-shared
  PLATFORM_LIBS=-L$(JAVALIB) -lawt$(DBG)
  # native_threads libhpi.so can be safely loaded at runtime.
! EXTRA_LIBS=
  # green threads libhpi.so must be loaded at link time due to libc issues.
  GREEN_EXTRA_LIBS=-L$(JAVALIB)/green_threads -lhpi$(DBG)
  EXTRA_CFLAGS=-I$(INTL_INCLUDE) -D_BSD_SOURCE
diff -cr work/j2se/make/java/nio/Makefile work-hack/j2se/make/java/nio/Makefile
*** work/j2se/make/java/nio/Makefile	Sat Sep 13 12:31:59 2003
--- work-hack/j2se/make/java/nio/Makefile	Sat Sep 13 10:25:28 2003
***************
*** 131,137 ****
  
  # XXXBSD: really need it for BSD ?
  ifeq ($(PLATFORM), bsd)
! OTHER_CFLAGS += -Werror
  OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH)$(SUFFIX) -ljava$(SUFFIX) -lnet$(SUFFIX)
  endif
  
--- 131,137 ----
  
  # XXXBSD: really need it for BSD ?
  ifeq ($(PLATFORM), bsd)
! #OTHER_CFLAGS += -Werror
  OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH)$(SUFFIX) -ljava$(SUFFIX) -lnet$(SUFFIX)
  endif