[Pkg-ocaml-maint-commits] r1737 - in
trunk/packages/mlgmp/trunk/debian: . patches
Mike Furr
mfurr at costa.debian.org
Sat Sep 3 19:51:45 UTC 2005
Author: mfurr
Date: 2005-09-03 19:51:44 +0000 (Sat, 03 Sep 2005)
New Revision: 1737
Added:
trunk/packages/mlgmp/trunk/debian/patches/15_bugfixes.dpatch
Modified:
trunk/packages/mlgmp/trunk/debian/changelog
trunk/packages/mlgmp/trunk/debian/patches/00list
trunk/packages/mlgmp/trunk/debian/patches/11_Makefile.dpatch
Log:
release -7.
applied bug fixes from Pascal Zimmer
Use -O2 instead of -O3 to avoid ICE on m68k
Modified: trunk/packages/mlgmp/trunk/debian/changelog
===================================================================
--- trunk/packages/mlgmp/trunk/debian/changelog 2005-09-03 16:25:59 UTC (rev 1736)
+++ trunk/packages/mlgmp/trunk/debian/changelog 2005-09-03 19:51:44 UTC (rev 1737)
@@ -1,3 +1,15 @@
+mlgmp (20021123-7) unstable; urgency=low
+
+ * Use -O2 instead of -O3 to hopefully avoid an ICE on m68k
+ * Several bug fixes from Pascal Zimmer including
+ - Z2.copy is really Z.copy
+ - Added a real Z2.copy
+ - _mlgmp_z2_from_[int|string_base|float] now use mpz_set
+ insetad of mpz_init_set
+ - Added test suite for these functions
+
+ -- Mike Furr <mfurr at debian.org> Sat, 3 Sep 2005 15:11:10 -0400
+
mlgmp (20021123-6) unstable; urgency=low
* Rebuild against new gmp package.
Modified: trunk/packages/mlgmp/trunk/debian/patches/00list
===================================================================
--- trunk/packages/mlgmp/trunk/debian/patches/00list 2005-09-03 16:25:59 UTC (rev 1736)
+++ trunk/packages/mlgmp/trunk/debian/patches/00list 2005-09-03 19:51:44 UTC (rev 1737)
@@ -1,2 +1,3 @@
10_config.dpatch
11_Makefile.dpatch
+15_bugfixes.dpatch
Modified: trunk/packages/mlgmp/trunk/debian/patches/11_Makefile.dpatch
===================================================================
--- trunk/packages/mlgmp/trunk/debian/patches/11_Makefile.dpatch 2005-09-03 16:25:59 UTC (rev 1736)
+++ trunk/packages/mlgmp/trunk/debian/patches/11_Makefile.dpatch 2005-09-03 19:51:44 UTC (rev 1737)
@@ -21,9 +21,9 @@
exit 0
@DPATCH@
-diff -urNad /home/furrm/debian/pkg-ocaml-maint/packages/mlgmp/trunk/mlgmp-20021123/Makefile mlgmp-20021123/Makefile
---- /home/furrm/debian/pkg-ocaml-maint/packages/mlgmp/trunk/mlgmp-20021123/Makefile 2004-04-18 12:44:35.000000000 -0400
-+++ mlgmp-20021123/Makefile 2004-04-18 12:47:43.000000000 -0400
+diff -urNad --exclude=CVS --exclude=.svn ./Makefile /tmp/dpep-work.HWFzlv/mlgmp-20021123/Makefile
+--- ./Makefile 2005-09-03 15:15:47.339340437 -0400
++++ /tmp/dpep-work.HWFzlv/mlgmp-20021123/Makefile 2005-09-03 15:15:56.140184593 -0400
@@ -2,12 +2,14 @@
RANLIB= ranlib
@@ -48,7 +48,7 @@
CC= gcc
-CFLAGS_MISC= -Wall -Wno-unused -g -O3
-+CFLAGS_MISC= -Wall -Wno-unused -g -O3 -fPIC
++CFLAGS_MISC= -Wall -Wno-unused -g -O2 -fPIC
#CFLAGS_MISC=
CFLAGS_INCLUDE= -I $(OCAML_LIBDIR) $(GMP_INCLUDES)
CFLAGS= $(CFLAGS_MISC) $(CFLAGS_INCLUDE)
Added: trunk/packages/mlgmp/trunk/debian/patches/15_bugfixes.dpatch
===================================================================
--- trunk/packages/mlgmp/trunk/debian/patches/15_bugfixes.dpatch 2005-09-03 16:25:59 UTC (rev 1736)
+++ trunk/packages/mlgmp/trunk/debian/patches/15_bugfixes.dpatch 2005-09-03 19:51:44 UTC (rev 1737)
@@ -0,0 +1,104 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 15_bugfixes.dpatch by Mike Furr <mfurr at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./gmp.ml /tmp/dpep-work.FYBj8e/mlgmp-20021123/gmp.ml
+--- ./gmp.ml 2002-11-23 08:13:53.000000000 -0500
++++ /tmp/dpep-work.FYBj8e/mlgmp-20021123/gmp.ml 2005-09-03 15:18:53.505890041 -0400
+@@ -66,7 +66,7 @@
+ external from_float: dest: t->float->unit = "_mlgmp_z2_from_float";;
+
+ external create: unit->t = "_mlgmp_z_create";;
+- external copy: dest: t-> from: t-> unit = "_mlgmp_z_copy";;
++ external copy: dest: t-> from: t-> unit = "_mlgmp_z2_copy";;
+ external add: dest: t-> t->t->unit = "_mlgmp_z2_add";;
+ external sub: dest: t-> t->t->unit = "_mlgmp_z2_sub";;
+ external mul: dest: t-> t->t->unit = "_mlgmp_z2_mul";;
+@@ -85,6 +85,7 @@
+
+ module Z = struct
+ type t = Z2.t;;
++ external copy: t->t = "_mlgmp_z_copy";;
+ external of_int: int->t = "_mlgmp_z_from_int";;
+ external from_int: int->t = "_mlgmp_z_from_int";;
+ external from_string_base: base: int->string->t="_mlgmp_z_from_string_base";;
+diff -urNad --exclude=CVS --exclude=.svn ./gmp.mli /tmp/dpep-work.FYBj8e/mlgmp-20021123/gmp.mli
+--- ./gmp.mli 2002-11-23 08:13:54.000000000 -0500
++++ /tmp/dpep-work.FYBj8e/mlgmp-20021123/gmp.mli 2005-09-03 15:18:53.505890041 -0400
+@@ -14,7 +14,7 @@
+ = "_mlgmp_z2_from_string_base"
+ external from_float : dest:t -> float -> unit = "_mlgmp_z2_from_float"
+ external create : unit -> t = "_mlgmp_z_create"
+- external copy : dest:t -> from:t -> unit = "_mlgmp_z_copy"
++ external copy : dest:t -> from:t -> unit = "_mlgmp_z2_copy"
+ external add : dest:t -> t -> t -> unit = "_mlgmp_z2_add"
+ external sub : dest:t -> t -> t -> unit = "_mlgmp_z2_sub"
+ external mul : dest:t -> t -> t -> unit = "_mlgmp_z2_mul"
+@@ -31,6 +31,7 @@
+ module Z :
+ sig
+ type t = Z2.t
++ external copy : t -> t = "_mlgmp_z_copy"
+ external from_int : int -> t = "_mlgmp_z_from_int"
+ external of_int : int -> t = "_mlgmp_z_from_int"
+ external from_string_base : base:int -> string -> t
+diff -urNad --exclude=CVS --exclude=.svn ./mlgmp_z.c /tmp/dpep-work.FYBj8e/mlgmp-20021123/mlgmp_z.c
+--- ./mlgmp_z.c 2002-11-23 12:47:20.000000000 -0500
++++ /tmp/dpep-work.FYBj8e/mlgmp-20021123/mlgmp_z.c 2005-09-03 15:18:53.506889909 -0400
+@@ -58,6 +58,13 @@
+ CAMLreturn(r);
+ }
+
++value _mlgmp_z2_copy(value dest, value from)
++{
++ CAMLparam2(dest, from);
++ mpz_set(*mpz_val(dest), *mpz_val(from));
++ CAMLreturn(Val_unit);
++}
++
+ value _mlgmp_z_from_int(value ml_val)
+ {
+ CAMLparam1(ml_val);
+@@ -88,21 +95,21 @@
+ value _mlgmp_z2_from_int(value r, value ml_val)
+ {
+ CAMLparam2(r, ml_val);
+- mpz_init_set_si(*mpz_val(r), Int_val(ml_val));
++ mpz_set_si(*mpz_val(r), Int_val(ml_val));
+ CAMLreturn(Val_unit);
+ }
+
+ value _mlgmp_z2_from_string_base(value r, value base, value ml_val)
+ {
+ CAMLparam3(r, base, ml_val);
+- mpz_init_set_str(*mpz_val(r), String_val(ml_val), Int_val(base));
++ mpz_set_str(*mpz_val(r), String_val(ml_val), Int_val(base));
+ CAMLreturn(Val_unit);
+ }
+
+ value _mlgmp_z2_from_float(value r, value ml_val)
+ {
+ CAMLparam2(r, ml_val);
+- mpz_init_set_d(*mpz_val(r), Double_val(ml_val));
++ mpz_set_d(*mpz_val(r), Double_val(ml_val));
+ CAMLreturn(Val_unit);
+ }
+
+diff -urNad --exclude=CVS --exclude=.svn ./test_suite.ml /tmp/dpep-work.FYBj8e/mlgmp-20021123/test_suite.ml
+--- ./test_suite.ml 2002-11-21 07:26:37.000000000 -0500
++++ /tmp/dpep-work.FYBj8e/mlgmp-20021123/test_suite.ml 2005-09-03 15:18:53.506889909 -0400
+@@ -1,5 +1,11 @@
+ open Gmp;;
+
++assert ((Z.from_int 578) = (let r = Z2.create () in Z2.copy r (Z.from_int 578); r));
++assert ((Z.from_int 578) = (let r = Z2.create () in Z2.from_int r 578; r));
++assert ((Z.from_int 578) = (let r = Z2.create () in Z2.from_string_base r 10 "578"; r));
++(*to be used only with corrected sources *)
++(*assert ((Z.from_int 578) = (Z.copy (Z.from_int 578)));*)
++assert ((Z.from_int 578) = (let r = Z2.create () in Z2.from_float r 578.; r));
+ assert ((Z.from_int 578) = (Z.from_string_base ~base: 10 "578"));
+ assert ((Z.from_int 578) = (Z.from_float 578.));
+ assert ((Z.to_string_base ~base: 10 (Z.from_int 578)) = "578");
Property changes on: trunk/packages/mlgmp/trunk/debian/patches/15_bugfixes.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-ocaml-maint-commits
mailing list