Building 1.5 under 4.x ...

[Greg Lewis]

On Mon, Mar 21, 2005 at 11:08:39PM -0400, Marc G. Fournier wrote:
> Just trying to build it from ports, and it exits with the following ... 
> anything I should be doing to get past this?

Use the attached patches.  I'll commit them after the port freeze is over
once Alexey has eyeballed them.

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

--- ../../j2se/src/solaris/native/common/gdefs_md.h.orig	Sun Mar 20 22:14:34 2005
+++ ../../j2se/src/solaris/native/common/gdefs_md.h	Sun Mar 20 22:15:13 2005
@@ -19,5 +19,9 @@
 #include <malloc.h>
 #endif /* __linux__ */
 #ifdef _ALLBSD_SOURCE
+#if defined(__FreeBSD__) && __FreeBSD__ < 5
+#include <inttypes.h>
+#else
 #include <stdint.h>
+#endif
 #endif /* _ALLBSD_SOURCE */
-------------- next part --------------
$FreeBSD$

--- ../../j2se/src/solaris/native/sun/java2d/j2d_md.h.orig	Sun Mar 20 22:20:43 2005
+++ ../../j2se/src/solaris/native/sun/java2d/j2d_md.h	Sun Mar 20 22:24:40 2005
@@ -14,7 +14,11 @@
  * NetBSD's doesn't either, so let's do it for everyone.
  */
 #if defined(__linux__) || defined(_ALLBSD_SOURCE)
+#if defined(__FreeBSD__) && __FreeBSD__ < 5
+#include <inttypes.h>
+#else
 #include <stdint.h>
+#endif
 #endif /* __linux__ || _ALLBSD_SOURCE */
 
 typedef unsigned char	jubyte;
-------------- next part --------------
$FreeBSD$

--- ../../j2se/src/share/native/sun/awt/medialib/mlib_types.h.orig	Sun Mar 20 22:08:20 2005
+++ ../../j2se/src/share/native/sun/awt/medialib/mlib_types.h	Sun Mar 20 22:08:33 2005
@@ -47,7 +47,11 @@
 
 #if defined(_ALLBSD_SOURCE)
 #include <stddef.h>                     /* for ptrdiff_t */
+#if defined(__FreeBSD__) && __FreeBSD__ < 5
+#include <inttypes.h>
+#else
 #include <stdint.h>                     /* for uintptr_t */
+#endif
 #elif defined(__linux__)
 #include <stdint.h>                     /* for uintptr_t */
 #include <malloc.h>                     /* for ptrdiff_t */