found 396699 0.97-3
reopen 396699
thanks
Hi,
the current version still fails to build on GNU/kFreeBSD,
see
http://experimental.ftbfs.de/build.php?&pkg=cacao&ver=0.97-3&arch=kfreebsd-i386&file=log
The cacao-freebsd.patch misses the chunk for src/vm/suck.c
from original submission.
In mean time, we also ported java (gcj-4.1) for kfreebsd-amd64, but
the boehm-gc used in cacao 0.97 does not support kfreebsd-amd64 yet.
The support will appear in boehm-gc 6.9 (already accepted by upstream).
Please find attached patch which updates
debian/patches/cacao-freebsd.patch by
- adding missing chunk for src/vm/suck.c,
needed for both kfreebsd-i386 and kfreebsd-amd64
- adding three chunks for src/boehm-gc/
needed only for kfreebsd-amd64
Thanks in advance
Petrdiff -u cacao-0.97/debian/patches/cacao-freebsd.patch
cacao-0.97/debian/patches/cacao-freebsd.patch
--- cacao-0.97/debian/patches/cacao-freebsd.patch
+++ cacao-0.97/debian/patches/cacao-freebsd.patch
@@ -1,3 +1,54 @@
+diff -u cacao/src/boehm-gc/include/private/gcconfig.h
cacao/src/boehm-gc/include/private/gcconfig.h
+--- cacao/src/boehm-gc/include/private/gcconfig.h
++++ cacao/src/boehm-gc/include/private/gcconfig.h
+@@ -334,6 +334,10 @@
+ # define I386
+ # define mach_type_known
+ # endif
++# if defined(FREEBSD) && defined(__x86_64__)
++# define X86_64
++# define mach_type_known
++# endif
+ # if defined(__NetBSD__) && (defined(i386) || defined(__i386__))
+ # define I386
+ # define mach_type_known
+only in patch2:
+unchanged:
+--- cacao/src/boehm-gc.orig/os_dep.c
++++ cacao/src/boehm-gc/os_dep.c
+@@ -84,7 +84,7 @@
+ # define NEED_FIND_LIMIT
+ # endif
+
+-#if defined(FREEBSD) && (defined(I386) || defined(powerpc) ||
defined(__powerpc__))
++#if defined(FREEBSD) && (defined(I386) || defined(X86_64) || defined(powerpc)
|| defined(__powerpc__))
+ # include <machine/trap.h>
+ # if !defined(PCR)
+ # define NEED_FIND_LIMIT
+@@ -1392,7 +1392,7 @@
+ }
+ # endif
+
+-# if defined(FREEBSD) && (defined(I386) || defined(powerpc) ||
defined(__powerpc__)) && !defined(PCR)
++# if defined(FREEBSD) && (defined(I386) || defined(X86_64) ||
defined(powerpc) || defined(__powerpc__)) && !defined(PCR)
+ /* Its unclear whether this should be identical to the above, or */
+ /* whether it should apply to non-X86 architectures. */
+ /* For now we don't assume that there is always an empty page after */
+only in patch2:
+unchanged:
+--- cacao-0.97.orig/src/vm/suck.c
++++ cacao-0.97/src/vm/suck.c
+@@ -99,7 +99,7 @@
+ s4 namlen;
+
+ #if defined(_DIRENT_HAVE_D_NAMLEN)
+- namlen = d_namlen;
++ namlen = a->d_namlen;
+ #else
+ namlen = strlen(a->d_name);
+ #endif
+only in patch2:
+unchanged:
--- cacao-0.97.orig/configure.ac
+++ cacao-0.97/configure.ac
@@ -87,6 +87,12 @@
_______________________________________________
pkg-java-maintainers mailing list
pkg-java-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers
