[Pkg-ocaml-maint-commits] r1583 - in trunk/packages/ocaml/trunk/debian: . patches

[Sven Luther]

Author: luther
Date: 2005-08-09 18:09:10 +0000 (Tue, 09 Aug 2005)
New Revision: 1583

Added:
   trunk/packages/ocaml/trunk/debian/patches/byterun_interp_ia64_fix.dpatch
Modified:
   trunk/packages/ocaml/trunk/debian/changelog
   trunk/packages/ocaml/trunk/debian/patches/00list
Log:
Fixed ia64 FTBFS.


Modified: trunk/packages/ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml/trunk/debian/changelog	2005-08-09 13:23:28 UTC (rev 1582)
+++ trunk/packages/ocaml/trunk/debian/changelog	2005-08-09 18:09:10 UTC (rev 1583)
@@ -1,3 +1,11 @@
+ocaml (3.08.3-7) UNRELEASED; urgency=low
+
+  Changes by Sven Luther:
+  * debian/patches/byterun_interp_ia64_fix.dpatch
+    - Removed spurious ia64 cast which broke builds with gcc 4.0
+
+ -- Sven Luther <luther at debian.org>  Tue,  9 Aug 2005 20:06:13 +0200
+
 ocaml (3.08.3-6) unstable; urgency=low
 
   Changes by Stefano Zacchiroli:

Modified: trunk/packages/ocaml/trunk/debian/patches/00list
===================================================================
--- trunk/packages/ocaml/trunk/debian/patches/00list	2005-08-09 13:23:28 UTC (rev 1582)
+++ trunk/packages/ocaml/trunk/debian/patches/00list	2005-08-09 18:09:10 UTC (rev 1583)
@@ -4,3 +4,5 @@
 asmcomp_amd64_emit.mlp
 fix_i386_gcc4_build
 ocaml-md5sums
+byterun_interp_ia64_fix
+

Added: trunk/packages/ocaml/trunk/debian/patches/byterun_interp_ia64_fix.dpatch
===================================================================
--- trunk/packages/ocaml/trunk/debian/patches/byterun_interp_ia64_fix.dpatch	2005-08-09 13:23:28 UTC (rev 1582)
+++ trunk/packages/ocaml/trunk/debian/patches/byterun_interp_ia64_fix.dpatch	2005-08-09 18:09:10 UTC (rev 1583)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## byterun_interp_ia64_fix.dpatch Sven LUther <luther at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disabled not-really-needed ia64 cast which broke with gcc 4.0.
+
+ at DPATCH@
+--- ocaml-3.08.3/byterun/interp.c.orig	2005-08-09 16:58:22.000000000 +0000
++++ ocaml-3.08.3/byterun/interp.c	2005-08-09 16:58:42.000000000 +0000
+@@ -55,11 +55,7 @@
+ #  ifdef DEBUG
+ #    define Next goto next_instr
+ #  else
+-#    ifdef __ia64__
+-#      define Next goto *(void *)(jumptbl_base + *((uint32 *) pc)++)
+-#    else
+-#      define Next goto *(void *)(jumptbl_base + *pc++)
+-#    endif
++#    define Next goto *(void *)(jumptbl_base + *pc++)
+ #  endif
+ #else
+ #  define Instruct(name) case name


Property changes on: trunk/packages/ocaml/trunk/debian/patches/byterun_interp_ia64_fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *