[Pkg-ocaml-maint-commits] r1851 -
trunk/packages/ocaml/branches/3.09.0/debian/patches
Sven Luther
luther at costa.debian.org
Thu Oct 27 19:24:50 UTC 2005
Author: luther
Date: 2005-10-27 19:24:49 +0000 (Thu, 27 Oct 2005)
New Revision: 1851
Removed:
trunk/packages/ocaml/branches/3.09.0/debian/patches/asmcomp_amd64_emit.mlp.dpatch
trunk/packages/ocaml/branches/3.09.0/debian/patches/byterun_interp_ia64_fix.dpatch
trunk/packages/ocaml/branches/3.09.0/debian/patches/fix_i386_gcc4_build.dpatch
trunk/packages/ocaml/branches/3.09.0/debian/patches/map_fold_order.dpatch
Modified:
trunk/packages/ocaml/branches/3.09.0/debian/patches/00list
trunk/packages/ocaml/branches/3.09.0/debian/patches/versioned_libdir.dpatch
Log:
Adapted patches to 3.09.0.
Modified: trunk/packages/ocaml/branches/3.09.0/debian/patches/00list
===================================================================
--- trunk/packages/ocaml/branches/3.09.0/debian/patches/00list 2005-10-27 19:08:40 UTC (rev 1850)
+++ trunk/packages/ocaml/branches/3.09.0/debian/patches/00list 2005-10-27 19:24:49 UTC (rev 1851)
@@ -1,7 +1,3 @@
versioned_libdir
objinfo
man-ocamlmklib
-asmcomp_amd64_emit.mlp
-fix_i386_gcc4_build
-byterun_interp_ia64_fix
-map_fold_order
Deleted: trunk/packages/ocaml/branches/3.09.0/debian/patches/asmcomp_amd64_emit.mlp.dpatch
===================================================================
--- trunk/packages/ocaml/branches/3.09.0/debian/patches/asmcomp_amd64_emit.mlp.dpatch 2005-10-27 19:08:40 UTC (rev 1850)
+++ trunk/packages/ocaml/branches/3.09.0/debian/patches/asmcomp_amd64_emit.mlp.dpatch 2005-10-27 19:24:49 UTC (rev 1851)
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## asmcomp_amd64_emit.mlp.dpatch by <julien.cristau at ens-lyon.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Upstream fix for code generation bug on amd64 (PR#3640)
-
- at DPATCH@
-diff -urNad ocaml-3.08.3.orig/asmcomp/amd64/emit.mlp ocaml-3.08.3/asmcomp/amd64/emit.mlp
---- ocaml-3.08.3.orig/asmcomp/amd64/emit.mlp 2004-07-01 18:09:03.000000000 +0200
-+++ ocaml-3.08.3/asmcomp/amd64/emit.mlp 2005-06-14 03:08:25.481518269 +0200
-@@ -10,7 +10,7 @@
- (* *)
- (***********************************************************************)
-
--(* $Id: emit.mlp,v 1.6.6.1 2004/07/01 16:09:03 xleroy Exp $ *)
-+(* $Id: emit.mlp,v 1.6.6.2 2005/06/12 13:35:56 xleroy Exp $ *)
-
- (* Emission of Intel 386 assembly code *)
-
-@@ -35,8 +35,12 @@
- !contains_calls || num_stack_slots.(0) > 0 || num_stack_slots.(1) > 0
-
- let frame_size () = (* includes return address *)
-- let sz = (!stack_offset + 8 * (num_stack_slots.(0) + num_stack_slots.(1)) + 8)
-+ if frame_required() then begin
-+ let sz =
-+ (!stack_offset + 8 * (num_stack_slots.(0) + num_stack_slots.(1)) + 8)
- in Misc.align sz 16
-+ end else
-+ !stack_offset + 8
-
- let slot_offset loc cl =
- match loc with
Deleted: trunk/packages/ocaml/branches/3.09.0/debian/patches/byterun_interp_ia64_fix.dpatch
===================================================================
--- trunk/packages/ocaml/branches/3.09.0/debian/patches/byterun_interp_ia64_fix.dpatch 2005-10-27 19:08:40 UTC (rev 1850)
+++ trunk/packages/ocaml/branches/3.09.0/debian/patches/byterun_interp_ia64_fix.dpatch 2005-10-27 19:24:49 UTC (rev 1851)
@@ -1,22 +0,0 @@
-#! /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
Deleted: trunk/packages/ocaml/branches/3.09.0/debian/patches/fix_i386_gcc4_build.dpatch
===================================================================
--- trunk/packages/ocaml/branches/3.09.0/debian/patches/fix_i386_gcc4_build.dpatch 2005-10-27 19:08:40 UTC (rev 1850)
+++ trunk/packages/ocaml/branches/3.09.0/debian/patches/fix_i386_gcc4_build.dpatch 2005-10-27 19:24:49 UTC (rev 1851)
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_i386_gcc4_build.dpatch by Julien Cristau <julien.cristau at ens-lyon.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch from upstream to fix build on i386 with gcc4.
-## DP: This is recorded as PR#3604 and PR#3637
-## DP: http://camlcvs.inria.fr/cgi-bin/cvsweb/ocaml/otherlibs/num/bng_ia32.c.diff?r1=1.3;r2=1.3.6.1
-
- at DPATCH@
-diff -urNad ocaml-3.08.3.orig/otherlibs/num/bng_ia32.c ocaml-3.08.3/otherlibs/num/bng_ia32.c
---- ocaml-3.08.3.orig/otherlibs/num/bng_ia32.c 2003-10-26 10:51:11.000000000 +0100
-+++ ocaml-3.08.3/otherlibs/num/bng_ia32.c 2005-06-20 17:34:10.015173470 +0200
-@@ -121,8 +121,8 @@
- "leal 4(%1), %1 \n\t"
- "decl %2 \n\t"
- "jnz 1b"
-- : "+&r" (a), "+&r" (b), "+&rm" (blen), "+&r" (out)
-- : "rm" (d)
-+ : "+&r" (a), "+&r" (b), "+&r" (blen), "=m" (out)
-+ : "m" (d)
- : "eax", "edx");
- }
- if (alen == 0) return out;
-@@ -164,8 +164,8 @@
- "leal 4(%1), %1 \n\t"
- "decl %2 \n\t"
- "jnz 1b"
-- : "+&r" (a), "+&r" (b), "+&rm" (blen), "+&rm" (out), "=&r" (tmp)
-- : "rm" (d)
-+ : "+&r" (a), "+&r" (b), "=m" (blen), "=m" (out), "=&r" (tmp)
-+ : "m" (d)
- : "eax", "edx");
- }
- if (alen == 0) return out;
Deleted: trunk/packages/ocaml/branches/3.09.0/debian/patches/map_fold_order.dpatch
===================================================================
--- trunk/packages/ocaml/branches/3.09.0/debian/patches/map_fold_order.dpatch 2005-10-27 19:08:40 UTC (rev 1850)
+++ trunk/packages/ocaml/branches/3.09.0/debian/patches/map_fold_order.dpatch 2005-10-27 19:24:49 UTC (rev 1851)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## map_fold_order.dpatch by Samuel Mimram <smimram at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make Map.fold order conform to the specification.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./stdlib/map.ml /tmp/dpep-work.68QXab/ocaml-3.08.3/stdlib/map.ml
---- ./stdlib/map.ml 2004-04-23 12:01:33.000000000 +0200
-+++ /tmp/dpep-work.68QXab/ocaml-3.08.3/stdlib/map.ml 2005-09-08 20:27:30.000000000 +0200
-@@ -161,7 +161,7 @@
- match m with
- Empty -> accu
- | Node(l, v, d, r, _) ->
-- fold f l (f v d (fold f r accu))
-+ fold f r (f v d (fold f l accu))
-
- type 'a enumeration = End | More of key * 'a * 'a t * 'a enumeration
-
Modified: trunk/packages/ocaml/branches/3.09.0/debian/patches/versioned_libdir.dpatch
===================================================================
--- trunk/packages/ocaml/branches/3.09.0/debian/patches/versioned_libdir.dpatch 2005-10-27 19:08:40 UTC (rev 1850)
+++ trunk/packages/ocaml/branches/3.09.0/debian/patches/versioned_libdir.dpatch 2005-10-27 19:24:49 UTC (rev 1851)
@@ -27,8 +27,8 @@
case "$libdir" in
- "") echo 'LIBDIR=$(PREFIX)/lib/camlp4' >> Makefile.cnf
- libdir="$prefix/lib/camlp4";;
-+ "") echo 'LIBDIR=$(PREFIX)/lib/ocaml/3.08.3/camlp4' >> Makefile.cnf
-+ libdir="$prefix/lib/ocaml/3.08.3/camlp4";;
++ "") echo 'LIBDIR=$(PREFIX)/lib/ocaml/3.09.0/camlp4' >> Makefile.cnf
++ libdir="$prefix/lib/ocaml/3.09.0/camlp4";;
*) echo "LIBDIR=$libdir" >> Makefile.cnf;;
esac
case "$mandir" in
@@ -48,8 +48,8 @@
case "$libdir" in
- "") echo 'LIBDIR=$(PREFIX)/lib/ocaml' >> Makefile
- libdir="$prefix/lib/ocaml";;
-+ "") echo 'LIBDIR=$(PREFIX)/lib/ocaml/3.08.3' >> Makefile
-+ libdir="$prefix/lib/ocaml/3.08.3";;
++ "") echo 'LIBDIR=$(PREFIX)/lib/ocaml/3.09.0' >> Makefile
++ libdir="$prefix/lib/ocaml/3.09.0";;
*) echo "LIBDIR=$libdir" >> Makefile;;
esac
echo 'STUBLIBDIR=$(LIBDIR)/stublibs' >> Makefile
More information about the Pkg-ocaml-maint-commits
mailing list