Your message dated Mon, 15 Jan 2007 08:32:03 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#396699: fixed in cacao 0.97-3
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--- Begin Message ---
Package: cacao
Severity: important
Version: 0.97-1
Tags: patch


Hi,

the current version fails to build on GNU/kFreeBSD.

Please find attached patch with small tweaks.

It would also be nice if you can ask upstream
to include changes to src/vm/suck.c and configure.ac.

Thanks in advance

                        Petr
diff -u cacao-0.97/debian/rules cacao-0.97/debian/rules
--- cacao-0.97/debian/rules
+++ cacao-0.97/debian/rules
@@ -5,8 +5,12 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS := --with-classpath-prefix=/usr 
--with-classpath-includedir=/usr/include/classpath --disable-disassembler
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="$(LDFLAGS) -Wl,-z,defs" \
-        JAVAC="jikes-classpath"
+DEB_CONFIGURE_SCRIPT_ENV += JAVAC="jikes-classpath"
+ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-__thread
+else
+DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="$(LDFLAGS) -Wl,-z,defs"
+endif
 
 binary-predeb/cacao::
        # Move executables
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 @@
     ARCH_CFLAGS="$ARCH_CFLAGS -D__DARWIN__ -ansi -pedantic -Wall 
-Wno-long-long"
     ;;
 
+*kfreebsd*-gnu)
+    OS_DIR="freebsd"
+    INTRP_CFLAGS="$ARCH_CFLAGS -D__FREEBSD__ -Wall -Wno-long-long 
-D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED 
-D_BSD_SOURCE"
+    ARCH_CFLAGS="$ARCH_CFLAGS -D__FREEBSD__ -ansi -pedantic -Wall 
-Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 
-D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
+    ;;
+
 *freebsd* )
     OS_DIR="freebsd"
     INTRP_CFLAGS="$ARCH_CFLAGS -D__FREEBSD__ -Wall -Wno-long-long 
-D_XOPEN_SOURCE_EXTENDED"
only in patch2:
unchanged:
--- cacao-0.97.orig/configure
+++ cacao-0.97/configure
@@ -2694,6 +2694,12 @@
     ARCH_CFLAGS="$ARCH_CFLAGS -D__DARWIN__ -ansi -pedantic -Wall 
-Wno-long-long"
     ;;
 
+*kfreebsd*-gnu)
+    OS_DIR="freebsd"
+    INTRP_CFLAGS="$ARCH_CFLAGS -D__FREEBSD__ -Wall -Wno-long-long 
-D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED 
-D_BSD_SOURCE"
+    ARCH_CFLAGS="$ARCH_CFLAGS -D__FREEBSD__ -ansi -pedantic -Wall 
-Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 
-D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
+    ;;
+
 *freebsd* )
     OS_DIR="freebsd"
     INTRP_CFLAGS="$ARCH_CFLAGS -D__FREEBSD__ -Wall -Wno-long-long 
-D_XOPEN_SOURCE_EXTENDED"

--- End Message ---
--- Begin Message ---
Source: cacao
Source-Version: 0.97-3

We believe that the bug you reported is fixed in the latest version of
cacao, which is due to be installed in the Debian FTP archive:

cacao_0.97-3.diff.gz
  to pool/main/c/cacao/cacao_0.97-3.diff.gz
cacao_0.97-3.dsc
  to pool/main/c/cacao/cacao_0.97-3.dsc
cacao_0.97-3_i386.deb
  to pool/main/c/cacao/cacao_0.97-3_i386.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Michael Koch <[EMAIL PROTECTED]> (supplier of updated cacao package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Mon, 15 Jan 2007 08:40:46 +0100
Source: cacao
Binary: cacao
Architecture: source i386
Version: 0.97-3
Distribution: unstable
Urgency: low
Maintainer: Debian Java Maintainers 
<[email protected]>
Changed-By: Michael Koch <[EMAIL PROTECTED]>
Description: 
 cacao      - Java virtual machine
Closes: 396699 400172
Changes: 
 cacao (0.97-3) unstable; urgency=low
 .
   * Increased (Build-)Depends on classpath to 2:0.92 (Closes: #400172).
   * Added support for kfreebsd in debian/rules and added
     debian/patches/cacao-freebsd.patch. Based on patch by Petr Salinger.
     (Closes: #396699)
Files: 
 a72df89fd1cf3736eef829b20fb1ad46 793 interpreters optional cacao_0.97-3.dsc
 980616885b3337dc4fd8946c877982db 7966 interpreters optional 
cacao_0.97-3.diff.gz
 0b23b29ff38aaad8234ccc18c67399c7 605392 interpreters optional 
cacao_0.97-3_i386.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFFqzHCWSOgCCdjSDsRAohDAKCSuX+GX39YLclSkoRFf5OWRu2XrwCgmr2n
MybjGDHIkV7M/uvWc+5NVSs=
=fTJi
-----END PGP SIGNATURE-----


--- End Message ---
_______________________________________________
pkg-java-maintainers mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers

Reply via email to