jdk14 on -current

[Greg Lewis]

On Sun, Aug 24, 2003 at 01:40:40PM +0900, Yamada Ken Takeshi wrote:
>   I think your patch solves hotspot compile error relating to
> foo##bar.

Well, thats all that was meant to be included in that particular patch.

>   However, I have had the following error, and cannot compile.
> It is endian definition error(?).
> 
>   :              :             :            :
> /usr/bin/gcc  -fno-strict-aliasing -fPIC -W -Wall  -Wno-unused -Wno-parentheses -Werror  -Di586 -DARCH='"i586"' -DRELEASE='"1.4.1-p3"' -DFULL_VERSION='"1.4.1-p3-ken_24_aug_2003_13_34"' -D_GNU_SOURCE -D_REENTRANT -D_THREAD_SAFE -D_LITTLE_ENDIAN -I. -I/usr/ports/java/jdk14/work/control/build/bsd-i586/tmp/java/java.nio/nio/CClassHeaders -I../../../src/solaris/javavm/export -I../../../src/share/javavm/export -I../../../src/share/javavm/include -I../../../src/solaris/javavm/include -I../../../src/share/native/sun/nio/ch -I../../../src/share/native/java/io -I../../../src/share/native/java/net -I../../../src/solaris/native/java/net -I../../../src/share/native/common -I../../../src/solaris/native/common -I../../../src/share/native/java/nio -I../../../src/solaris/native/java/nio    -c -o /usr/ports/java/jdk14/work/control/build/bsd-i586/tmp/java/java.nio/nio/obj/DatagramChannelImpl.o  ../../../src/solaris/native/sun/nio/ch/DatagramChannelImpl.c
> In file included from /usr/include/sys/types.h:49,
>                  from /usr/include/sys/param.h:67,
>                  from ../../../src/solaris/javavm/export/jvm_md.h:17,
>                  from ../../../src/share/javavm/export/jvm.h:16,
>                  from ../../../src/solaris/native/sun/nio/ch/DatagramChannelImpl.c:10:
> /usr/include/machine/endian.h:53:1: "_LITTLE_ENDIAN" redefined
> <command line>:14:1: this is the location of the previous definition
> gmake[4]: *** [/usr/ports/java/jdk14/work/control/build/bsd-i586/tmp/java/java.nio/nio/obj/DatagramChannelImpl.o] Error 1
> gmake[4]: Leaving directory `/usr/ports/java/jdk14/work/j2se/make/java/nio'
> gmake[3]: *** [optimized] Error 2
> gmake[3]: Leaving directory `/usr/ports/java/jdk14/work/j2se/make/java/nio'
> gmake[2]: *** [all] Error 1
> gmake[2]: Leaving directory `/usr/ports/java/jdk14/work/j2se/make/java'
> gmake[1]: *** [all] Error 1
> gmake[1]: Leaving directory `/usr/ports/java/jdk14/work/j2se/make'
> gmake: *** [j2se-build] Error 2
> *** Error code 2

The correct fix for this is to find all uses of _LITTLE_ENDIAN and replace
them with uses of the appropriate defines included from <endian.h>.

However, as a workaround the attached patch may work as this should just
be a warning.

-- 
Greg Lewis                          Email   : glewis at eyesbeyond.com
Eyes Beyond                         Web     : http://www.eyesbeyond.com
Information Technology              FreeBSD : glewis at FreeBSD.org

-------------- next part --------------
Index: j2se/make/java/nio/Makefile
===================================================================
RCS file: /var/jcvs/javasrc_1_4_scsl/j2se/make/java/nio/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- j2se/make/java/nio/Makefile	15 Feb 2003 14:45:49 -0000	1.4
+++ j2se/make/java/nio/Makefile	24 Aug 2003 05:37:04 -0000
@@ -131,7 +131,7 @@
 
 # XXXBSD: really need it for BSD ?
 ifeq ($(PLATFORM), bsd)
-OTHER_CFLAGS += -Werror
+#OTHER_CFLAGS += -Werror
 OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH)$(SUFFIX) -ljava$(SUFFIX) -lnet$(SUFFIX)
 endif