[med-svn] [Git][med-team/maude][master] 3 commits: Fix for 32-bit arches

[Nilesh Patra]

Nilesh Patra pushed to branch master at Debian Med / maude


Commits:
cc8cd440 by Nilesh Patra at 2020-12-15T21:59:20+05:30
Fix for 32-bit arches

- - - - -
a28f5231 by Nilesh Patra at 2020-12-15T21:59:39+05:30
Standards-Version: 4.5.1

- - - - -
98c8b430 by Nilesh Patra at 2020-12-15T22:00:09+05:30
Update changelog

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/32-bit-fixes.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+maude (3.1-2) unstable; urgency=medium
+
+  * Team Upload.
+  * Fix for 32-bit arches
+  * Standards-Version: 4.5.1
+
+ -- Nilesh Patra <npatra974 at gmail.com>  Tue, 15 Dec 2020 21:59:43 +0530
+
 maude (3.1-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -13,7 +13,7 @@ Build-Depends: debhelper-compat (= 13),
                flex,
                libncurses5-dev,
                libcvc4-dev
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Vcs-Browser: https://salsa.debian.org/med-team/maude
 Vcs-Git: https://salsa.debian.org/med-team/maude.git
 Homepage: http://maude.cs.uiuc.edu


=====================================
debian/patches/32-bit-fixes.patch
=====================================
@@ -0,0 +1,34 @@
+--- a/src/BuiltIn/succSymbol.hh
++++ b/src/BuiltIn/succSymbol.hh
+@@ -46,6 +46,15 @@
+ 			  Vector<Term*>& terms);
+   void postInterSymbolPass();
+   void reset();
++
++#if SIZEOF_LONG < 8
++  DagNode* makeNatDag(Int64 nat)
++  {
++    mpz_class bigNat;
++    mpz_import(bigNat.get_mpz_t(), 1, 1, sizeof(nat), 0, 0, &nat);
++    return makeNatDag(bigNat);
++  }
++#endif
+   //
+   //	Functions special to SuccSymbol.
+   //
+--- a/src/Meta/interpreterManagerSymbol.cc
++++ b/src/Meta/interpreterManagerSymbol.cc
+@@ -599,6 +599,12 @@
+ DagNode*
+ InterpreterManagerSymbol::upRewriteCount(const RewritingContext* context)
+ {
+-  mpz_class totalCount(context->getTotalCount());
++#if SIZEOF_LONG == 8
++   mpz_class totalCount(context->getTotalCount());
++#else
++  Int64 totalCount64 = context->getTotalCount();
++  mpz_class totalCount;
++  mpz_import(totalCount.get_mpz_t(), 1, 1, sizeof(totalCount64), 0, 0, &totalCount64);
++#endif
+   return metaLevel->upNat(totalCount);
+ }


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 search-datadir.patch
 getinput-size_t.patch
 strip-build-date.patch
+32-bit-fixes.patch



View it on GitLab: https://salsa.debian.org/med-team/maude/-/compare/6df01f9bd5531bb6b9695f0113b2f26a2ee61a90...98c8b430c77f01e7e1d736c70bedd1731e1746b7

-- 
View it on GitLab: https://salsa.debian.org/med-team/maude/-/compare/6df01f9bd5531bb6b9695f0113b2f26a2ee61a90...98c8b430c77f01e7e1d736c70bedd1731e1746b7
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/20201215/5324fce7/attachment-0001.html>