Date: Sunday, September 4, 2016 @ 10:44:01
Author: arojas
Revision: 188520
NTL 9.11 rebuild
Added:
singular/trunk/currring.patch
Modified:
singular/trunk/PKGBUILD
----------------+
PKGBUILD | 9 ++++-----
currring.patch | 22 ++++++++++++++++++++++
2 files changed, 26 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-09-04 10:22:55 UTC (rev 188519)
+++ PKGBUILD 2016-09-04 10:44:01 UTC (rev 188520)
@@ -5,7 +5,7 @@
pkgname=singular
pkgver=3.1.7.p1
_majver=3-1-7
-pkgrel=22
+pkgrel=23
pkgdesc="Computer Algebra System for polynomial computations"
arch=(i686 x86_64)
url="http://www.singular.uni-kl.de/"
@@ -14,13 +14,12 @@
options=(!buildflags)
source=("http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/src/$_majver/Singular-${_majver}p1.tar.gz"
"http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/src/$_majver/Singular-${_majver}-share.tar.gz"
- 'templates.patch' 'ntl8.patch' "http://git.sagemath.org/sage.git/plain/build/pkgs/singular/patches/currring.patch"
- 'fix-include-dirs.patch' 'singular-gcc6.patch')
+ templates.patch ntl8.patch currring.patch fix-include-dirs.patch singular-gcc6.patch)
md5sums=('ce369519d1c5d07342722e78240ea044'
'b9177c00e95ee21b137984bade9fc481'
'8ca8ba06c846a8de189fff322d557705'
'2c028bbda467b437d5598ac07cd7211f'
- '1fe968092b5e98878cd9b47c7d9acc81'
+ '9be8f7bc07e3314c0202f2f9cb0f7467'
'31bdcc87548dd1fdc2cf5a73545b4f2d'
'36bb2a3fa574275215464f835dd16e05')
@@ -32,7 +31,7 @@
# fix flint detection
sed -e 's|-lmpir|-lgmp|' -i factory/configure -i Singular/configure
# fix segfault
- patch -p1 -i ../currring.patch
+ patch -p2 -i ../currring.patch
# fix factory include dir
patch -p1 -i ../fix-include-dirs.patch
# fix build with GCC 6 (Fedora)
Added: currring.patch
===================================================================
--- currring.patch (rev 0)
+++ currring.patch 2016-09-04 10:44:01 UTC (rev 188520)
@@ -0,0 +1,22 @@
+Revert part of commit a53ae5000c439608b9dcf884b63d62b219e8fcc0.
+
+It makes Singular segfault at least when calling pOne() and currRing is NULL.
+diff -druN a/latest/Singular/iparith.cc b/latest/Singular/iparith.cc
+--- a/latest/Singular/iparith.cc 2014-11-19 05:06:05.000000000 -0800
++++ b/latest/Singular/iparith.cc 2014-11-20 08:30:25.068389635 -0800
+@@ -8477,7 +8477,6 @@
+ sArithBase.sCmds[i].name);
+ sArithBase.sCmds[i].alias=1;
+ }
+- #if 0
+ if (currRingHdl==NULL)
+ {
+ #ifdef SIQ
+@@ -8493,7 +8492,6 @@
+ }
+ #endif
+ }
+- #endif
+ if (!expected_parms)
+ {
+ switch (tok)