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

[doko at alioth.debian.org]

Author: doko
Date: 2008-10-11 19:48:19 +0000 (Sat, 11 Oct 2008)
New Revision: 7130

Added:
   trunk/cacao/debian/patches/cacao-data-start.diff
Modified:
   trunk/cacao/debian/changelog
   trunk/cacao/debian/rules
Log:
cacao (0.99.4~20081011-2) unstable; urgency=low

  [ Matthias Klose ]
  * Use openjdk-6 on alpha as a build dependency.

  [ Michael Koch ]
  * Added patch for mips(el), s390 to find __data_start symbol.


Modified: trunk/cacao/debian/changelog
===================================================================
--- trunk/cacao/debian/changelog	2008-10-11 18:34:00 UTC (rev 7129)
+++ trunk/cacao/debian/changelog	2008-10-11 19:48:19 UTC (rev 7130)
@@ -1,9 +1,13 @@
-cacao (0.99.4~20081011-2) UNRELEASED; urgency=low
+cacao (0.99.4~20081011-2) unstable; urgency=low
 
+  [ Matthias Klose ]
   * Use openjdk-6 on alpha as a build dependency.
 
- -- Matthias Klose <doko at debian.org>  Sat, 11 Oct 2008 20:31:57 +0200
+  [ Michael Koch ]
+  * Added patch for mips(el), s390 to find __data_start symbol.
 
+ -- Matthias Klose <doko at debian.org>  Sat, 11 Oct 2008 20:54:42 +0200
+
 cacao (0.99.4~20081011-1) unstable; urgency=low
 
   * Apply patches from the cacao-oj6 package from Ubuntu intrepid:
@@ -11,7 +15,6 @@
     - debian/patches/cacao-no-mmap-first-page.diff: On arm-linux the
       first memory page can't be mmap'ed, as it contains the exception
       vectors.
-    - Add -rdynamic to LDFLAGS on mips, mipsel, s390.
   * Upload with correct maintainer address.
 
  -- Matthias Klose <doko at debian.org>  Sat, 11 Oct 2008 12:46:37 +0200

Added: trunk/cacao/debian/patches/cacao-data-start.diff
===================================================================
--- trunk/cacao/debian/patches/cacao-data-start.diff	                        (rev 0)
+++ trunk/cacao/debian/patches/cacao-data-start.diff	2008-10-11 19:48:19 UTC (rev 7130)
@@ -0,0 +1,22 @@
+--- cacao/src/mm/boehm-gc/include/private/gcconfig.h.orig	2008-09-10 18:06:16.000000000 +0200
++++ cacao/src/mm/boehm-gc/include/private/gcconfig.h	2008-10-11 21:16:45.000000000 +0200
+@@ -1320,8 +1320,7 @@
+ #     define DYNAMIC_LOADING
+       extern int _end[];
+ #     define DATAEND (_end)
+-      extern int __data_start[];
+-#     define DATASTART ((ptr_t)(__data_start))
++#     define SEARCH_FOR_DATA_START
+ #     define CPP_WORDSZ _MIPS_SZPTR
+ #     define ALIGNMENT (_MIPS_SZPTR/8)
+ #     if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 2 || __GLIBC__ > 2
+@@ -1708,8 +1707,7 @@
+ #       define OS_TYPE "LINUX"
+ #       define LINUX_STACKBOTTOM
+ #       define DYNAMIC_LOADING
+-	extern int __data_start[];
+-#       define DATASTART ((ptr_t)(__data_start))
++#       define SEARCH_FOR_DATA_START
+     extern int _end[];
+ #   define DATAEND (_end)
+ #   define CACHE_LINE_SIZE 256

Modified: trunk/cacao/debian/rules
===================================================================
--- trunk/cacao/debian/rules	2008-10-11 18:34:00 UTC (rev 7129)
+++ trunk/cacao/debian/rules	2008-10-11 19:48:19 UTC (rev 7130)
@@ -22,11 +22,7 @@
 ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
   DEB_CONFIGURE_EXTRA_FLAGS += --enable-__thread
 else
-  ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel s390 s390x))
-    DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="$(LDFLAGS) -Wl,-z,defs -rdynamic"
-  else
-    DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="$(LDFLAGS) -Wl,-z,defs"
-  endif
+  DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="$(LDFLAGS) -Wl,-z,defs"
 endif
 
 DEB_DH_MAKESHLIBS_ARGS := -X/usr/lib/cacao