Rebuild for flint 2.6.0 and normaliz 3.8.6 without polymake support.

Add -flint patch.
This commit is contained in:
Jerry James 2020-07-09 10:55:28 -06:00
parent 6f7856f323
commit 128811bc3a
2 changed files with 29 additions and 1 deletions

22
Singular-flint.patch Normal file
View File

@ -0,0 +1,22 @@
--- singular-4.1.1/m4/flint-check.m4.orig 2018-07-31 07:05:52.000000000 -0600
+++ singular-4.1.1/m4/flint-check.m4 2020-07-06 10:59:54.667384578 -0600
@@ -69,7 +69,7 @@ for FLINT_HOME in ${FLINT_HOME_PATH}
[
AC_TRY_RUN(
[#include <flint/flint.h>
- int main () { if ((int) version[0] < 2) return -1; else return 0; }
+ int main () { if ((int) flint_version[0] < 2) return -1; else return 0; }
],[
flint_found="yes"
break
--- singular-4.1.1/Singular/misc_ip.cc.orig 2018-07-31 07:05:52.000000000 -0600
+++ singular-4.1.1/Singular/misc_ip.cc 2020-07-06 11:00:28.616358457 -0600
@@ -811,7 +811,7 @@ char * versionString(/*const bool bShowD
#endif
#ifdef HAVE_FLINT
- StringAppend("FLINT(%s),",version);
+ StringAppend("FLINT(%s),",flint_version);
#endif
StringAppendS("factory(" FACTORYVERSION "),\n\t");
#ifdef XMEMORY_H

View File

@ -19,7 +19,7 @@
Name: Singular
Version: %{downstreamver}%{?patchver}
Release: 13%{?dist}
Release: 13.1%{?dist}
Summary: Computer Algebra System for polynomial computations
# License analysis:
# - factory/readcf.cc, Singular/grammar.cc, and Singular/grammar.h are
@ -101,6 +101,8 @@ Patch7: %{name}-alias.patch
Patch8: %{name}-emacs.patch
# Adapt to polymake >= 3.3
Patch9: %{name}-polymake.patch
# Adapt to flint 2.6
Patch10: %{name}-flint.patch
%description
Singular is a computer algebra system for polynomial computations, with
@ -462,6 +464,10 @@ make check
%changelog
* Wed Jul 8 2020 Jerry James <loganjerry@gmail.com> - 4.1.1p3-13.1
- Rebuild for flint 2.6.0 and normaliz 3.8.6 without polymake support
- Add -flint patch
* Wed Mar 4 2020 Jerry James <loganjerry@gmail.com> - 4.1.1p3-13
- Rebuild for polymake 4.0