[med-svn] [Git][med-team/mcl][master] Update patches

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / mcl


Commits:
0320df3b by Andreas Tille at 2022-10-26T10:58:53+02:00
Update patches

- - - - -


4 changed files:

- − debian/patches/01-restrict-variables.patch
- debian/patches/OCamlSupport.patch
- − debian/patches/gcc-10-port.patch
- debian/patches/series


Changes:

=====================================
debian/patches/01-restrict-variables.patch deleted
=====================================
@@ -1,39 +0,0 @@
-Author: Philipp Benner
-Last-Update: 2013-01-27 15:17:54 +0000
-Description: remove spaces in the program name (which is not allowed in manuals)
-
---- a/src/impala/matrix.c
-+++ b/src/impala/matrix.c
-@@ -1855,18 +1855,18 @@
- mclv* mclgUnionv
- (  mclx* mx
- ,  const mclv* coldom
--,  const mclv* restrict
-+,  const mclv* restrict_var
- ,  mcxenum scratch_STATUS
- ,  mclv* dst
- )
--   {  return mclgUnionv2(mx, coldom, restrict, scratch_STATUS, dst, mx->dom_rows)
-+   {  return mclgUnionv2(mx, coldom, restrict_var, scratch_STATUS, dst, mx->dom_rows)
- ;  }
- 
- 
- mclv* mclgUnionv2
- (  const mclx* mx
- ,  const mclv* coldom
--,  const mclv* restrict
-+,  const mclv* restrict_var
- ,  mcxenum scratch_STATUS
- ,  mclv* dst
- ,  mclv* scratch
-@@ -1911,8 +1911,8 @@
-                )
-                continue               /* SNH if coldom is subset of mx->dom_cols */
-             ;  if
--               (  restrict
--               && 0 > (o_restrict = mclvGetIvpOffset(restrict, idx, o_restrict))
-+               (  restrict_var
-+               && 0 > (o_restrict = mclvGetIvpOffset(restrict_var, idx, o_restrict))
-                )
-                continue               /* not found in restriction domain */
- 


=====================================
debian/patches/OCamlSupport.patch
=====================================
@@ -42,7 +42,7 @@ Last-Update: 2020-06-02
 +++ b/caml/caml_mcl.c
 @@ -0,0 +1,76 @@
 +#include <stdio.h>
-+#include "util/rand.h"
++#include <tingea/rand.h>
 +#include "src/impala/app.h"
 +#include "src/mcl/alg.h"
 +#include "caml/mlvalues.h"


=====================================
debian/patches/gcc-10-port.patch deleted
=====================================
@@ -1,37 +0,0 @@
-Description: fixes FTBFS on gcc-10
- A major change to gcc-10 migration is its default to -f-no-common. Instead of overriding and using 
- the old behaviour (by using -fcommon), this patch uses the preferred method of fixing some 
- declarations in the header files via the use of extern.
-Bug-Debian: https://bugs.debian.org/957525
-Author: Shayan Doust <hello at shayandoust.me> 
-Last-Update: 2020-07-22
----
-
-Index: mcl/src/impala/iface.h
-===================================================================
---- mcl.orig/src/impala/iface.h
-+++ mcl/src/impala/iface.h
-@@ -16,15 +16,15 @@
- 
- /* This file currently provides nothing */
- 
--dim nu_meet_can  ;
--dim nu_meet_sl   ;
--dim nu_meet_zip  ;
--dim nu_diff_can  ;
--dim nu_diff_sl   ;
--dim nu_diff_zip  ;
--double nu_magic  ;
-+extern dim nu_meet_can  ;
-+extern dim nu_meet_sl   ;
-+extern dim nu_meet_zip  ;
-+extern dim nu_diff_can  ;
-+extern dim nu_diff_sl   ;
-+extern dim nu_diff_zip  ;
-+extern double nu_magic  ;
- 
--dim mclx_n_thread_g  ;
-+extern dim mclx_n_thread_g  ;
- 
- #endif
- 


=====================================
debian/patches/series
=====================================
@@ -1,6 +1,4 @@
-# gcc-10-port.patch
 OCamlSupport.patch
-# 01-restrict-variables.patch
 02-wrong-interpreter-path.patch
 05-manual-what-is.patch
 spelling.patch



View it on GitLab: https://salsa.debian.org/med-team/mcl/-/commit/0320df3bbb155ae086d49222a5b28bdf5305aaa7

-- 
View it on GitLab: https://salsa.debian.org/med-team/mcl/-/commit/0320df3bbb155ae086d49222a5b28bdf5305aaa7
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20221026/a197aaa8/attachment-0001.htm>