From: Sven Luther Date: Thu, 27 Oct 2005 19:24:49 +0000 (+0000) Subject: Adapted patches to 3.09.0. X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~723 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2f06036176e57e8c409267731d92db78b9510984;p=ocaml.git Adapted patches to 3.09.0. --- diff --git a/debian/patches/00list b/debian/patches/00list index 54c87f47..858d13e0 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,7 +1,3 @@ versioned_libdir objinfo man-ocamlmklib -asmcomp_amd64_emit.mlp -fix_i386_gcc4_build -byterun_interp_ia64_fix -map_fold_order diff --git a/debian/patches/asmcomp_amd64_emit.mlp.dpatch b/debian/patches/asmcomp_amd64_emit.mlp.dpatch deleted file mode 100755 index 08284cec..00000000 --- a/debian/patches/asmcomp_amd64_emit.mlp.dpatch +++ /dev/null @@ -1,33 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## asmcomp_amd64_emit.mlp.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Upstream fix for code generation bug on amd64 (PR#3640) - -@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 diff --git a/debian/patches/byterun_interp_ia64_fix.dpatch b/debian/patches/byterun_interp_ia64_fix.dpatch deleted file mode 100755 index 49723f92..00000000 --- a/debian/patches/byterun_interp_ia64_fix.dpatch +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## byterun_interp_ia64_fix.dpatch Sven LUther -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Disabled not-really-needed ia64 cast which broke with gcc 4.0. - -@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 diff --git a/debian/patches/fix_i386_gcc4_build.dpatch b/debian/patches/fix_i386_gcc4_build.dpatch deleted file mode 100755 index ff4c1977..00000000 --- a/debian/patches/fix_i386_gcc4_build.dpatch +++ /dev/null @@ -1,34 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## fix_i386_gcc4_build.dpatch by Julien Cristau -## -## 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 - -@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; diff --git a/debian/patches/map_fold_order.dpatch b/debian/patches/map_fold_order.dpatch deleted file mode 100755 index 5763d77b..00000000 --- a/debian/patches/map_fold_order.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## map_fold_order.dpatch by Samuel Mimram -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Make Map.fold order conform to the specification. - -@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 - diff --git a/debian/patches/versioned_libdir.dpatch b/debian/patches/versioned_libdir.dpatch index d9b82c9c..922e053f 100755 --- a/debian/patches/versioned_libdir.dpatch +++ b/debian/patches/versioned_libdir.dpatch @@ -27,8 +27,8 @@ diff -ur ocaml-3.08.orig/camlp4/config/configure_batch ocaml-3.08/camlp4/config/ 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 @@ diff -ur ocaml-3.08.orig/configure ocaml-3.08/configure 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 diff --git a/ocaml-tags-svn2git.sh b/ocaml-tags-svn2git.sh new file mode 100644 index 00000000..720b9dbf --- /dev/null +++ b/ocaml-tags-svn2git.sh @@ -0,0 +1,8 @@ +#!/bin/zsh -e +export GIT_AUTHOR_NAME +export GIT_AUTHOR_EMAIL +export GIT_AUTHOR_DATE +export GIT_COMMITTER_NAME +export GIT_COMMITTER_EMAIL +export GIT_COMMITTER_DATE +