Skip to content

Commit

Permalink
Trac #17254: Upgrade to Singular-4.x.x
Browse files Browse the repository at this point in the history
'''Lots''' of stuff has changed in Singular 4.
This is a big update.

Build system completely changed, and a lot of internal stuff.

Original upstream tarball at `www.mathematik.uni-
kl.de/ftp/pub/Math/Singular/SOURCES/4-0-3/`:  `singular-4.0.3p3`
'''dot''' `tar` '''dot''' `gz`

Modified tarball made with spkg-src at:
* http://www.lmona.de/files/sage/singular-4.0.3p3.tar.bz2

This corresponds to commit a070b84d whose message tells 4.0.3p3 and on
which this branch was based:
* Singular/Singular@a070b84d59be835a2946d1386ed
d3221d80f3fe7

You can also make your own tarball based on this commit or another one
with
{{{
env SINGULAR_GIT_COMMIT=a070b84d ./sage --sh build/pkgs/singular/spkg-
src
./sage --package fix-checksum singular
}}}
This script is loosely based on the `make_tar.sh` script from upstream.

URL: https://trac.sagemath.org/17254
Reported by: jdemeyer
Ticket author(s): Jakob Kroeker, Jean-Pierre Flori, Jeroen Demeyer, John
Perry, François Bissey, Leif Leonhardy, Dima Pasechnik
Reviewer(s): François Bissey, Jeroen Demeyer, Ben Hutz, Leif Leonhardy,
Dima Pasechnik, Travis Scrimshaw
  • Loading branch information
Release Manager authored and vbraun committed Oct 18, 2016
2 parents 0e248ff + f1a0dcc commit d34fb70
Show file tree
Hide file tree
Showing 71 changed files with 1,341 additions and 2,355 deletions.
33 changes: 2 additions & 31 deletions build/pkgs/singular/SPKG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,39 +27,10 @@ http://www.singular.uni-kl.de/

== Special Update/Build Instructions ==

See spkg-src.
Note that upstream also ships versions with numbering including a patchlevel.
See spkg-src to create the source tarball.

Other notes
* The option '--without-dynamic-kernel' is used on *all*
systems with the exception of Linux. The online README at
http://www.singular.uni-kl.de/svn/trunk/README says this should
be used on Solaris, with no mention of it being necessary for
OS X, or any other platform except Solaris.
* The online readme says that CONFIG_SHELL should be set to /bin/bash
on Solaris. This is not done currently. Since this does not build
fully as a 64-bit application on Solaris, CONFIG_SHELL should be
investigated as a possible cause later.
* Be sure that Singular/Singular.rc.in is present, as occasionally this
was missing, which caused problems on Cygwin (e.g., see #10235)
* Due to http://www.singular.uni-kl.de:8002/trac/ticket/438, we
currently always build Singular with its debug code. Change
--with-debug to $WITH_DEBUG in the configure call if this is fixed.
Other notes:
* If the environment variable SAGE_DEBUG is set to "yes", then
omalloc will be replaced by xalloc. The resulting Singular executable
and libsingular library will be slower than with omalloc, but allow
for easier debugging of memory corruptions.

=== Patches ===
* assert.patch: logic seems to be broken on some platforms
* Minor.h.patch: needs to have <time.h> included on Cygwin
* slibdir.patch: set default slibdir to ${datarootdir}/singular
instead of ${prefix}/LIB, see #13344.
* sanitize_gmp_header_hack.patch:
Fix and simplify generation of `factory/cf_gmp.h` (cf. #14737).
* flint.patch: avoid underlinking FLINT in libsingular.
* exeext.patch: Add $(EXEEXT) to some executable names.
* cygwin64.path: Support for Cywgin64.
* templates.patch: do not use -fno-implicit-templates, which breaks
the build with NTL 6.2.1 for some GCC versions and remove some
useless explicit template instantiations.
6 changes: 3 additions & 3 deletions build/pkgs/singular/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=singular-VERSION.tar.bz2
sha1=85ba9ce60eb1e0a8bc89d3f492d8b226ef5767d6
md5=d8d126cdb4fee457de4ed69e936918ef
cksum=2898347319
sha1=dd68e84ef7d0e6c35994e0fce0faa8edf38a7bb1
md5=fa240c6abb01b7c81d1e1942663867e6
cksum=4229890985
2 changes: 1 addition & 1 deletion build/pkgs/singular/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$(MP_LIBRARY) ntl flint readline mpfr
$(MP_LIBRARY) ntl flint readline mpfr cddlib

----------
All lines of this file are ignored except the first.
Expand Down
2 changes: 1 addition & 1 deletion build/pkgs/singular/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.7p1.p2
4.0.3p3
10 changes: 0 additions & 10 deletions build/pkgs/singular/patches/Minor.h.patch

This file was deleted.

17 changes: 0 additions & 17 deletions build/pkgs/singular/patches/assert.patch

This file was deleted.

34 changes: 0 additions & 34 deletions build/pkgs/singular/patches/conditional/cygwin64_debug.patch

This file was deleted.

106 changes: 0 additions & 106 deletions build/pkgs/singular/patches/conditional/sage_debug.patch

This file was deleted.

0 comments on commit d34fb70

Please sign in to comment.