Author: doko
Date: 2008-10-11 11:07:36 +0000 (Sat, 11 Oct 2008)
New Revision: 7128
Added:
trunk/cacao/debian/patches/cacao-mipsel-linux.diff
trunk/cacao/debian/patches/cacao-no-mmap-first-page.diff
Modified:
trunk/cacao/debian/changelog
trunk/cacao/debian/rules
Log:
* Apply patches from the cacao-oj6 package from Ubuntu intrepid:
- debian/patches/cacao-mipsel-linux.diff: Set JAVA_ARCH on mipsel.
- 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.
Modified: trunk/cacao/debian/changelog
===================================================================
--- trunk/cacao/debian/changelog 2008-10-11 09:55:24 UTC (rev 7127)
+++ trunk/cacao/debian/changelog 2008-10-11 11:07:36 UTC (rev 7128)
@@ -1,8 +1,14 @@
cacao (0.99.4~20081011-1) unstable; urgency=low
+ * Apply patches from the cacao-oj6 package from Ubuntu intrepid:
+ - debian/patches/cacao-mipsel-linux.diff: Set JAVA_ARCH on mipsel.
+ - 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 <[EMAIL PROTECTED]> Sat, 11 Oct 2008 09:49:46 +0000
+ -- Matthias Klose <[EMAIL PROTECTED]> Sat, 11 Oct 2008 12:46:37 +0200
cacao (0.99.4~20081011-0) unstable; urgency=low
Added: trunk/cacao/debian/patches/cacao-mipsel-linux.diff
===================================================================
--- trunk/cacao/debian/patches/cacao-mipsel-linux.diff
(rev 0)
+++ trunk/cacao/debian/patches/cacao-mipsel-linux.diff 2008-10-11 11:07:36 UTC
(rev 7128)
@@ -0,0 +1,44 @@
+--- cacao/configure.ac.orig 2008-09-10 18:42:21.000000000 +0200
++++ cacao/configure.ac 2008-10-11 12:25:34.000000000 +0200
+@@ -74,13 +74,18 @@
+ JAVA_ARCH="m68k"
+ ;;
+
+-mips | mipsel )
++mips )
+ ARCH_DIR="mips"
+ ARCH_CFLAGS="-D__MIPS__"
+- dnl Is this correct for mipsel?
+ JAVA_ARCH="mips"
+ ;;
+
++mipsel )
++ ARCH_DIR="mips"
++ ARCH_CFLAGS="-D__MIPS__"
++ JAVA_ARCH="mipsel"
++ ;;
++
+ powerpc )
+ ARCH_DIR="powerpc"
+ ARCH_CFLAGS="-m32 -D__POWERPC__"
+--- cacao/configure.orig 2008-10-11 10:46:02.000000000 +0200
++++ cacao/configure 2008-10-11 12:25:34.000000000 +0200
+@@ -2861,10 +2861,16 @@
+ JAVA_ARCH="m68k"
+ ;;
+
+-mips | mipsel )
++mips )
+ ARCH_DIR="mips"
+ ARCH_CFLAGS="-D__MIPS__"
+- JAVA_ARCH="mips"
++ JAVA_ARCH="mips"
++ ;;
++
++mipsel )
++ ARCH_DIR="mips"
++ ARCH_CFLAGS="-D__MIPS__"
++ JAVA_ARCH="mipsel"
+ ;;
+
+ powerpc )
Added: trunk/cacao/debian/patches/cacao-no-mmap-first-page.diff
===================================================================
--- trunk/cacao/debian/patches/cacao-no-mmap-first-page.diff
(rev 0)
+++ trunk/cacao/debian/patches/cacao-no-mmap-first-page.diff 2008-10-11
11:07:36 UTC (rev 7128)
@@ -0,0 +1,23 @@
+--- cacao/src/vm/jit/trap.c.orig 2008-07-07 13:36:19.000000000 +0200
++++ cacao/src/vm/jit/trap.c 2008-07-23 10:45:30.480113152 +0200
+@@ -59,20 +59,6 @@
+ */
+ void trap_init(void)
+ {
+-#if !(defined(__ARM__) && defined(__LINUX__))
+- /* On arm-linux the first memory page can't be mmap'ed, as it
+- contains the exception vectors. */
+-
+- int pagesize;
+-
+- /* mmap a memory page at address 0x0, so our hardware-exceptions
+- work. */
+-
+- pagesize = system_getpagesize();
+-
+- (void) system_mmap_anonymous(NULL, pagesize, PROT_NONE, MAP_PRIVATE |
MAP_FIXED);
+-#endif
+-
+ TRACESUBSYSTEMINITIALIZATION("trap_init");
+
+ #if !defined(TRAP_INSTRUCTION_IS_LOAD)
Modified: trunk/cacao/debian/rules
===================================================================
--- trunk/cacao/debian/rules 2008-10-11 09:55:24 UTC (rev 7127)
+++ trunk/cacao/debian/rules 2008-10-11 11:07:36 UTC (rev 7128)
@@ -6,13 +6,25 @@
DEB_BUILDDIR = $(DEB_SRCDIR)/build
-DEB_CONFIGURE_EXTRA_FLAGS := --with-java-runtime-library-prefix=/usr
--disable-disassembler --libdir=/usr/lib/cacao
--with-jni_h=/usr/include/classpath --with-jni_md_h=/usr/include/classpath
+DEB_CONFIGURE_EXTRA_FLAGS := \
+ --with-java-runtime-library-prefix=/usr \
+ --disable-disassembler \
+ --libdir=/usr/lib/cacao \
+ --with-jni_h=/usr/include/classpath \
+ --with-jni_md_h=/usr/include/classpath
+
DEB_CONFIGURE_SCRIPT_ENV += JAVAC="/usr/lib/jvm/default-java/bin/javac"
+
ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-__thread
+ DEB_CONFIGURE_EXTRA_FLAGS += --enable-__thread
else
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="$(LDFLAGS) -Wl,-z,defs"
+ 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
endif
+
DEB_DH_MAKESHLIBS_ARGS := -X/usr/lib/cacao
upstream_version := $(shell echo $(DEB_VERSION) | sed 's/-[^-]*$$//')
@@ -32,8 +44,13 @@
binary-predeb/cacao-source::
mkdir -p
$(CURDIR)/debian/$(cdbs_curpkg)/usr/src/cacao-$(upstream_version)
- tar -c --exclude=debian --exclude=build --exclude=*.cdbs-orig -f - . \
+ tar -c --exclude=debian --exclude=build --exclude=*.cdbs-orig
--exclude=*.orig -f - . \
| tar -x -C debian/$(cdbs_curpkg)/usr/src/cacao-$(upstream_version)
-f -
cd debian/$(cdbs_curpkg)/usr/src \
+ && for i in $(CURDIR)/debian/patches/*; do \
+ echo "Reverting patch $$i; \
+ patch -p1 -R --no-backup < $$i; \
+ done
+ cd debian/$(cdbs_curpkg)/usr/src \
&& tar cfj cacao-$(upstream_version).tar.bz2 cacao-$(upstream_version)
rm -rf debian/$(cdbs_curpkg)/usr/src/cacao-$(upstream_version)
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
