#13237: Upgrade Singular
----------------------------------------------------------------+-----------
Reporter: jdemeyer |
Owner: tbd
Type: enhancement |
Status: needs_work
Priority: major |
Milestone: sage-5.3
Component: packages |
Resolution:
Keywords: Singular spkg | Work
issues:
Report Upstream: None of the above - read trac for reasoning. |
Reviewers:
Authors: Jeroen Demeyer | Merged
in:
Dependencies: |
Stopgaps:
----------------------------------------------------------------+-----------
Comment (by AlexanderDreyer):
Just in case (won't have time tomorrow), I was so free to propose a
changed spkg here:
http://boxen.math.washington.edu/home/dreyer/spkg/singular-3-1-5.p0.spkg
As before, the changes are not committed yet. Also I haven't changes the
URL in the description, as Jeroen might continue with other fixes.
The changes are as follows (for review):
{{{ #!diff
--- singular-3-1-5.p0.old.diff 2012-08-05 22:36:36.000000000 +0200
+++ singular-3-1-5.p0.new.diff 2012-08-05 22:47:29.000000000 +0200
@@ -9,7 +9,7 @@
diff -r 1275ac543b53 SPKG.txt
--- a/SPKG.txt Sat Mar 17 11:18:23 2012 +0100
+++ b/SPKG.txt Sun Aug 05 22:36:36 2012 +0200
-@@ -30,14 +30,17 @@
+@@ -30,14 +30,19 @@
See spkg-changes for how to delete unnecessary stuff under src/
Several patches are applied.
@@ -32,10 +32,12 @@
+ http://www.singular.uni-kl.de:8002/trac/ticket/440
+ * singular_trac_441.patch: fix taken from upstream for
+ http://www.singular.uni-kl.de:8002/trac/ticket/441
++ * sage_trac_12089.patch: fix (also reported upstream) from
++ https://github.com/alexanderdreyer/SingularSources/commit/7902222
Other notes
* The option '--without-dynamic-kernel' is used on *all*
-@@ -51,9 +54,51 @@
+@@ -51,9 +56,54 @@
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)
@@ -49,7 +51,7 @@
== ChangeLog ==
-+=== singular-3-1-5.p0 (Jeroen Demeyer, 2 August 2012) ===
++=== singular-3-1-5.p0 (Jeroen Demeyer, 5 August 2012) ===
+ * Trac #13237: Upgrade to version 3-1-5.
+ * Removed patches which are now upstreamed:
+ - patches/Singular.Makefile.in.shared.patch
@@ -70,8 +72,11 @@
+ - singular_trac_439.patch
+ - singular_trac_440.patch
+ - singular_trac_441.patch
++ - sage_trac_12089.patch
+ * In spkg-install, remove distclean() step; merge clean_headers() and
+ part of the old distclean() into remove_old_version().
++ * In spkg-install, added slibdir="$SAGE_LOCAL/share/singular" to
++ $MAKE install-libsingular .
+ * Only unset LD on Darwin.
+ * Remove the unsetting of TMPDIR (bug fixed upstream).
+ * Do not override user-set CFLAGS and CXXFLAGS.
@@ -6812,6 +6817,39 @@
- #if defined(ix86Mac_darwin)
- #define HAVE_ELF_SYSTEM
- #endif
+diff -r 1275ac543b53 patches/sage_trac_12089.patch
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/patches/sage_trac_12089.patch Sun Aug 05 22:36:36 2012 +0200
+@@ -0,0 +1,29 @@
++From 7902222c6e73d452b3d75576bd9bc0140f5e827a Mon Sep 17 00:00:00 2001
++From: Alexander Dreyer <[email protected]>
++Date: Sat, 4 Aug 2012 21:53:32 +0200
++Subject: [PATCH] fix: apply LDFLAGS fixes from svn#13210/git#b1dfafe to
cygwin-specific flags (Sage's trac #12089; reported by Jean-Pierre Flori)
++
++---
++ Singular/Makefile.in | 6 +++---
++ 1 files changed, 3 insertions(+), 3 deletions(-)
++
++diff --git a/Singular/Makefile.in b/Singular/Makefile.in
++index c4a6e78..b907085 100644
++--- a/Singular/Makefile.in
+++++ b/Singular/Makefile.in
++@@ -90,9 +90,9 @@ LDFLAGSG = -L@prefix@/kernel -L../kernel -lkernel_g
@LD_DYN_FLAGS1@ @LDFLAGS@
++ LDFLAGSP = -L@prefix@/kernel -L../kernel -lkernel_p @LD_DYN_FLAGS1@
@LDFLAGS@
++ else
++ ## -L/usr/local/lib -L@prefix@/modules/python --> PySingular
++-LDFLAGS = -L@prefix@/kernel -L/bin -lkernel @LDFLAGS@
-L/usr/local/lib -L../modules/python
++-LDFLAGSG = -L@prefix@/kernel -L/bin -lkernel_g @LDFLAGS@
++-LDFLAGSP = -L@prefix@/kernel -L/bin -lkernel_p @LDFLAGS@
+++LDFLAGS = -L@prefix@/kernel -L../kernel -L/bin -lkernel
@LDFLAGS@ -L/usr/local/lib -L../modules/python
+++LDFLAGSG = -L@prefix@/kernel -L../kernel -L/bin -lkernel_g
@LDFLAGS@
+++LDFLAGSP = -L@prefix@/kernel -L../kernel -L/bin -lkernel_p
@LDFLAGS@
++ endif
++ LD_DYN_FLAGS1 = @LD_DYN_FLAGS1@
++ LD_DYN_FLAGS2 = @LD_DYN_FLAGS2@
++--
++1.6.0.2
++
diff -r 1275ac543b53 patches/sing_win.cc.diff
--- a/patches/sing_win.cc.diff Sat Mar 17 11:18:23 2012 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -7330,7 +7368,8 @@
+ config || return $?
$MAKE clean
- $MAKE install-libsingular
+- $MAKE install-libsingular
++ $MAKE slibdir="$SAGE_LOCAL/share/singular" install-libsingular
if [ $? -ne 0 ]; then
- echo "Unable to install libsingular."
}}}
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/13237#comment:42>
Sage <http://www.sagemath.org>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica,
and MATLAB
--
You received this message because you are subscribed to the Google Groups
"sage-trac" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/sage-trac?hl=en.
