[pkg-java] r3824 - in trunk/cacao/debian: . patches

mkoch at alioth.debian.org mkoch at alioth.debian.org
Sat Jul 14 13:00:59 UTC 2007 

Author: mkoch
Date: 2007-07-14 13:00:58 +0000 (Sat, 14 Jul 2007)
New Revision: 3824

Added:
   trunk/cacao/debian/patches/cacao-0.98-kfreebsd.patch
Modified:
   trunk/cacao/debian/changelog
   trunk/cacao/debian/control
   trunk/cacao/debian/patches/
Log:
cacao (0.98-2) unstable; urgency=low +
  * Added patch for Debain/kFreeBSD. Closes: #396699.
    Thanks to Petr Salinger.
  * (Build-)Depends on classpath (>= 2:0.95) and classpath-common (>= 2:0.95).
    Thanks to Thomas Weidner. Closes: #432000.
  * Added homepage link to long description.

 -- Michael Koch <konqueror at gmx.de>  Sat, 14 Jul 2007 14:47:16 +0200


Modified: trunk/cacao/debian/changelog
===================================================================
--- trunk/cacao/debian/changelog	2007-07-12 13:00:33 UTC (rev 3823)
+++ trunk/cacao/debian/changelog	2007-07-14 13:00:58 UTC (rev 3824)
@@ -1,3 +1,13 @@
+cacao (0.98-2) unstable; urgency=low
+
+  * Added patch for Debain/kFreeBSD. Closes: #396699.
+    Thanks to Petr Salinger.
+  * (Build-)Depends on classpath (>= 2:0.95) and classpath-common (>= 2:0.95).
+    Thanks to Thomas Weidner. Closes: #432000.
+  * Added homepage link to long description.
+
+ -- Michael Koch <konqueror at gmx.de>  Sat, 14 Jul 2007 14:47:16 +0200
+
 cacao (0.98-1) unstable; urgency=low
 
   * New upstream release (Closes: #428600)

Modified: trunk/cacao/debian/control
===================================================================
--- trunk/cacao/debian/control	2007-07-12 13:00:33 UTC (rev 3823)
+++ trunk/cacao/debian/control	2007-07-14 13:00:58 UTC (rev 3824)
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Stephan Michels <stephan at apache.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 4.1.0), classpath (>= 2:0.92), classpath-common (>= 2:0.92), gcj, jikes-classpath, zlib1g-dev, libltdl3-dev, zip, cdbs (>= 0.4.17)
+Build-Depends: debhelper (>= 4.1.0), classpath (>= 2:0.95), classpath-common (>= 2:0.95), gcj, jikes-classpath, zlib1g-dev, libltdl3-dev, zip, cdbs (>= 0.4.17)
 Standards-Version: 3.7.2
 
 Package: cacao
 Architecture: any
-Depends: classpath (>= 2:0.92), classpath-common (>= 2:0.92), ${shlibs:Depends}
+Depends: classpath (>= 2:0.95), classpath-common (>= 2:0.95), ${shlibs:Depends}
 Description: Java virtual machine
  CACAO is a free virtual machine for running Java programs
  It has a state-of-the-art optimizing JIT compiler, with 
@@ -18,3 +18,5 @@
  other free virtual machine.)  This is because some aspects of Java
  -- such as the Swing extensions -- are not implemented by the
  free GNU Classpath libraries, which the CACAO runtime uses.
+ .
+  Homepage: http://www.cacaojvm.org/


Property changes on: trunk/cacao/debian/patches
___________________________________________________________________
Name: svn:ignore
   + *.log


Added: trunk/cacao/debian/patches/cacao-0.98-kfreebsd.patch
===================================================================
--- trunk/cacao/debian/patches/cacao-0.98-kfreebsd.patch	                        (rev 0)
+++ trunk/cacao/debian/patches/cacao-0.98-kfreebsd.patch	2007-07-14 13:00:58 UTC (rev 3824)
@@ -0,0 +1,98 @@
+only in patch2:
+unchanged:
+--- cacao-0.98.orig/src/mm/boehm-gc/os_dep.c
++++ cacao-0.98/src/mm/boehm-gc/os_dep.c
+@@ -86,7 +86,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
+@@ -1394,7 +1394,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.98.orig/src/mm/boehm-gc/include/private/gcconfig.h
++++ cacao-0.98/src/mm/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-0.98.orig/configure.ac
++++ cacao-0.98/configure.ac
+@@ -129,6 +129,13 @@
+     ARCH_CFLAGS="$ARCH_CFLAGS -D__DARWIN__ -ansi -pedantic -Wall -Wno-long-long"
+     ;;
+ 
++dnl must be before *freebsd*
++*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"
+@@ -141,12 +148,6 @@
+     ARCH_CFLAGS="$ARCH_CFLAGS -D__IRIX__"
+     ;;
+ 
+-*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"
+-    ;;
+-
+ dnl must be before *linux*
+ *uclinux | *elf )
+     OS_DIR="uclinux"
+only in patch2:
+unchanged:
+--- cacao-0.98.orig/configure
++++ cacao-0.98/configure
+@@ -2768,6 +2768,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"
+@@ -2780,12 +2786,6 @@
+     ARCH_CFLAGS="$ARCH_CFLAGS -D__IRIX__"
+     ;;
+ 
+-*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"
+-    ;;
+-
+ *uclinux | *elf )
+     OS_DIR="uclinux"
+     INTRP_CFLAGS="$ARCH_CFLAGS -D__LINUX__ -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"

More information about the pkg-java-commits mailing list