[Pkg-ocaml-maint-commits] [SCM] mlgmp packaging branch, master, updated. debian/20021123-16-5-g343fd13
Mehdi Dogguy
mehdi at debian.org
Thu Jun 3 21:15:19 UTC 2010
The following commit has been merged in the master branch:
commit 6a91c18bbf28f2e9dba3ec2f192c1a974f16a65b
Author: Mehdi Dogguy <mehdi at debian.org>
Date: Thu Jun 3 22:41:56 2010 +0200
Fix wrong conversion from int on 64 bits computers
diff --git a/debian/changelog b/debian/changelog
index f392f78..e6461d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mlgmp (20021123-17) unstable; urgency=low
+
+ * debian/patches/20_mlgmp_z.dpatch: fix wrong conversion from int on
+ 64 bits computers (Closes: #573978).
+
+ -- Mehdi Dogguy <mehdi at debian.org> Thu, 03 Jun 2010 22:38:54 +0200
+
mlgmp (20021123-16) unstable; urgency=low
[ Sylvain Le Gall ]
diff --git a/debian/patches/00list b/debian/patches/00list
index 705ece7..8b5ae06 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
10_config.dpatch
11_Makefile.dpatch
15_bugfixes.dpatch
+20_mlgmp_z.dpatch
diff --git a/debian/patches/20_mlgmp_z.dpatch b/debian/patches/20_mlgmp_z.dpatch
new file mode 100755
index 0000000..b92ff91
--- /dev/null
+++ b/debian/patches/20_mlgmp_z.dpatch
@@ -0,0 +1,216 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Description: Fix wrong conversion from int on 64 bits computers
+## Origin/Author: Jean-Christophe Filliâtre
+## Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=573978
+## 20_mlgmp_z.dpatch by Mehdi Dogguy <mehdi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix wrong conversion from int on 64 bits computers.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' mlgmp~/mlgmp_z.c mlgmp/mlgmp_z.c
+--- mlgmp~/mlgmp_z.c 2010-06-03 22:34:02.000000000 +0200
++++ mlgmp/mlgmp_z.c 2010-06-03 22:38:50.000000000 +0200
+@@ -63,7 +63,7 @@
+ CAMLparam1(ml_val);
+ CAMLlocal1(r);
+ r=alloc_mpz();
+- mpz_init_set_si(*mpz_val(r), Int_val(ml_val));
++ mpz_init_set_si(*mpz_val(r), Long_val(ml_val)); /* FIX */
+ CAMLreturn(r);
+ }
+
+@@ -88,7 +88,7 @@
+ value _mlgmp_z2_from_int(value r, value ml_val)
+ {
+ CAMLparam2(r, ml_val);
+- mpz_set_si(*mpz_val(r), Int_val(ml_val));
++ mpz_set_si(*mpz_val(r), Long_val(ml_val));
+ CAMLreturn(Val_unit);
+ }
+
+@@ -151,14 +151,14 @@
+ CAMLparam2(a, b); \
+ CAMLlocal1(r); \
+ r=alloc_init_mpz(); \
+- mpz_##op(*mpz_val(r), *mpz_val(a), Int_val(b)); \
++ mpz_##op(*mpz_val(r), *mpz_val(a), Long_val(b)); \
+ CAMLreturn(r); \
+ } \
+ \
+ value _mlgmp_z2_##op(value r, value a, value b) \
+ { \
+ CAMLparam3(r, a, b); \
+- mpz_##op(*mpz_val(r), *mpz_val(a), Int_val(b)); \
++ mpz_##op(*mpz_val(r), *mpz_val(a), Long_val(b)); \
+ CAMLreturn(Val_unit); \
+ }
+
+@@ -196,7 +196,7 @@
+ CAMLparam3(a, b, modulus);
+ CAMLlocal1(r);
+ r=alloc_init_mpz();
+- mpz_powm_ui(*mpz_val(r), *mpz_val(a), Int_val(b), *mpz_val(modulus));
++ mpz_powm_ui(*mpz_val(r), *mpz_val(a), Long_val(b), *mpz_val(modulus));
+ CAMLreturn(r);
+ }
+
+@@ -205,7 +205,7 @@
+ CAMLparam2(a, b);
+ CAMLlocal1(r);
+ r=alloc_init_mpz();
+- mpz_ui_pow_ui(*mpz_val(r), Int_val(a), Int_val(b));
++ mpz_ui_pow_ui(*mpz_val(r), Long_val(a), Long_val(b));
+ CAMLreturn(r);
+ }
+
+@@ -221,14 +221,14 @@
+ value _mlgmp_z2_powm_ui(value r, value a, value b, value modulus)
+ {
+ CAMLparam4(r, a, b, modulus);
+- mpz_powm_ui(*mpz_val(r), *mpz_val(a), Int_val(b), *mpz_val(modulus));
++ mpz_powm_ui(*mpz_val(r), *mpz_val(a), Long_val(b), *mpz_val(modulus));
+ CAMLreturn(Val_unit);
+ }
+
+ value _mlgmp_z2_ui_pow_ui(value r, value a, value b)
+ {
+ CAMLparam3(r, a, b);
+- mpz_ui_pow_ui(*mpz_val(r), Int_val(a), Int_val(b));
++ mpz_ui_pow_ui(*mpz_val(r), Long_val(a), Long_val(b));
+ CAMLreturn(Val_unit);
+ }
+
+@@ -376,7 +376,7 @@
+ { \
+ CAMLparam2(n, d); \
+ CAMLlocal3(q, r, qr); \
+- unsigned long int ui_d = Int_val(d); \
++ unsigned long int ui_d = Long_val(d); \
+ \
+ if (! ui_d) division_by_zero(); \
+ \
+@@ -395,7 +395,7 @@
+ { \
+ CAMLparam2(n, d); \
+ CAMLlocal1(q); \
+- unsigned long int ui_d = Int_val(d); \
++ unsigned long int ui_d = Long_val(d); \
+ \
+ if (! ui_d) division_by_zero(); \
+ \
+@@ -409,7 +409,7 @@
+ value _mlgmp_z2_##kind##div_q_ui(value q, value n, value d) \
+ { \
+ CAMLparam3(q, n, d); \
+- unsigned long int ui_d = Int_val(d); \
++ unsigned long int ui_d = Long_val(d); \
+ \
+ if (! ui_d) division_by_zero(); \
+ \
+@@ -422,7 +422,7 @@
+ { \
+ CAMLparam2(n, d); \
+ CAMLlocal1(r); \
+- unsigned long int ui_d = Int_val(d); \
++ unsigned long int ui_d = Long_val(d); \
+ \
+ if (! ui_d) division_by_zero(); \
+ \
+@@ -436,7 +436,7 @@
+ value _mlgmp_z2_##kind##div_r_ui(value r, value n, value d) \
+ { \
+ CAMLparam3(r, n, d); \
+- unsigned long int ui_d = Int_val(d); \
++ unsigned long int ui_d = Long_val(d); \
+ \
+ if (! ui_d) division_by_zero(); \
+ \
+@@ -448,7 +448,7 @@
+ value _mlgmp_z_##kind##div_ui(value n, value d) \
+ { \
+ CAMLparam2(n, d); \
+- unsigned long int ui_d = Int_val(d); \
++ unsigned long int ui_d = Long_val(d); \
+ \
+ if (! ui_d) division_by_zero(); \
+ \
+@@ -492,7 +492,7 @@
+ { \
+ CAMLparam2(n, d); \
+ CAMLlocal1(q); \
+- unsigned int ld = Int_val(d); \
++ unsigned int ld = Long_val(d); \
+ \
+ if (! ld) \
+ division_by_zero(); \
+@@ -507,7 +507,7 @@
+ value _mlgmp_z2_##op(value q, value n, value d) \
+ { \
+ CAMLparam3(q, n, d); \
+- unsigned int ld = Int_val(d); \
++ unsigned int ld = Long_val(d); \
+ \
+ if (! ld) \
+ division_by_zero(); \
+@@ -584,7 +584,7 @@
+ value _mlgmp_z_compare_si(value a, value b)
+ {
+ CAMLparam2(a, b);
+- CAMLreturn(Val_int(mpz_cmp_si(*mpz_val(a), Int_val(b))));
++ CAMLreturn(Val_int(mpz_cmp_si(*mpz_val(a), Long_val(b))));
+ }
+
+ /*** Number theory */
+@@ -645,13 +645,13 @@
+ value _mlgmp_z_kronecker_si(value a, value b)
+ {
+ CAMLparam2(a, b);
+- CAMLreturn(Val_int(mpz_kronecker_si(*mpz_val(a), Int_val(b))));
++ CAMLreturn(Val_int(mpz_kronecker_si(*mpz_val(a), Long_val(b))));
+ }
+
+ value _mlgmp_z_si_kronecker(value a, value b)
+ {
+ CAMLparam2(a, b);
+- CAMLreturn(Val_int(mpz_si_kronecker(Int_val(a), *mpz_val(b))));
++ CAMLreturn(Val_int(mpz_si_kronecker(Long_val(a), *mpz_val(b))));
+ }
+
+ value _mlgmp_z_remove(value a, value b)
+@@ -673,7 +673,7 @@
+ CAMLparam1(a); \
+ CAMLlocal1(r); \
+ r = alloc_init_mpz(); \
+- mpz_##op(*mpz_val(r), Int_val(a)); \
++ mpz_##op(*mpz_val(r), Long_val(a)); \
+ CAMLreturn(r); \
+ }
+
+@@ -686,7 +686,7 @@
+ CAMLparam2(n, k);
+ CAMLlocal1(r);
+ r = alloc_init_mpz();
+- mpz_bin_uiui(*mpz_val(r), Int_val(n), Int_val(k));
++ mpz_bin_uiui(*mpz_val(r), Long_val(n), Long_val(k));
+ CAMLreturn(r);
+ }
+
+@@ -711,7 +711,7 @@
+ value _mlgmp_z_##op(value a, value b) \
+ { \
+ CAMLparam2(a, b); \
+- CAMLreturn(Val_int(mpz_##op(*mpz_val(a), Int_val(b)))); \
++ CAMLreturn(Val_int(mpz_##op(*mpz_val(a), Long_val(b)))); \
+ }
+
+ z_int_binary_op_ui(scan0)
+@@ -724,7 +724,7 @@
+ CAMLparam2(state, n); \
+ CAMLlocal1(r); \
+ r = alloc_init_mpz(); \
+- mpz_##op(*mpz_val(r), *randstate_val(state), Int_val(n)); \
++ mpz_##op(*mpz_val(r), *randstate_val(state), Long_val(n)); \
+ CAMLreturn(r); \
+ }
+
--
mlgmp packaging
More information about the Pkg-ocaml-maint-commits
mailing list