[sagemath] 02/02: Find local singular library.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch sage-6.5
in repository sagemath.

commit 9ecb890c38e616663911c977af100d1aa849be4e
Author: Tobias Hansen <tobias.han at gmx.de>
Date:   Sat Mar 21 09:06:27 2015 +0000

    Find local singular library.
---
 debian/patches/unbreak.patch | 39 +--------------------------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

diff --git a/debian/patches/unbreak.patch b/debian/patches/unbreak.patch
index d3e7c84..7334538 100644
--- a/debian/patches/unbreak.patch
+++ b/debian/patches/unbreak.patch
@@ -61,15 +61,6 @@
  
      # Display the startup banner
      if [ "$SAGE_BANNER" != "no" ]; then
-@@ -389,7 +389,7 @@
- 
- if [ "$1" = '-singular' -o "$1" = '--singular' ]; then
-     shift
--    exec singular "$@"
-+    exec Singular "$@"
- fi
- 
- if [ "$1" = '-sqlite3' -o "$1" = '--sqlite3' ]; then
 --- a/sage/src/bin/sage-build
 +++ b/sage/src/bin/sage-build
 @@ -27,4 +27,4 @@
@@ -141,7 +132,7 @@
  lib = env.SharedLibrary( "csage", [ "src/" + x for x in srcFiles ],
                           LIBS=['ntl', 'pari', 'gmp', 'python$PYV'],
 -                         LIBPATH=['$SAGE_LOCAL/lib','$SAGE_LOCAL/lib/python$PYV/config/'],
-+                         LIBPATH=['/usr/lib','/usr/lib/python$PYV/config/'],
++                         LIBPATH=['/usr/lib','/usr/lib/python$PYV/config/','$SAGE_LOCAL/lib'],
                           CPPPATH=includes )
  env.Install("$SAGE_LOCAL/lib", lib)
  env.Install("$SAGE_LOCAL/include/csage", [ os.path.join('include',x) for x in incFiles ])
@@ -369,17 +360,6 @@
  
      def __call__(self, facets):
          return self.solve(facets)
---- a/sage/src/sage/interfaces/singular.py
-+++ b/sage/src/sage/interfaces/singular.py
-@@ -2149,7 +2149,7 @@
-     nodes.clear()
-     node_names.clear()
- 
--    singular_docdir = os.environ["SAGE_LOCAL"]+"/share/singular/"
-+    singular_docdir = "/usr/share/singular-3-1-6/info/"
- 
-     new_node = re.compile("File: singular\.hlp,  Node: ([^,]*),.*")
-     new_lookup = re.compile("\* ([^:]*):*([^.]*)\..*")
 --- a/sage/src/sage/libs/gap/util.pyx
 +++ b/sage/src/sage/libs/gap/util.pyx
 @@ -156,7 +156,7 @@
@@ -401,23 +381,6 @@
 -    char* closure_func_err()
 +#cdef extern from 'pari/anal.h':
 +cdef extern char* closure_func_err()
---- a/sage/src/sage/libs/singular/singular.pyx
-+++ b/sage/src/sage/libs/singular/singular.pyx
-@@ -694,11 +694,9 @@
- 
-     cdef void *handle = NULL
- 
--    for extension in ["so", "dylib", "dll"]:
--        lib = os.environ['SAGE_LOCAL']+"/lib/libsingular."+extension
--        if os.path.exists(lib):
--            handle = dlopen(lib, RTLD_GLOBAL|RTLD_LAZY)
--            break
-+    lib = "/usr/lib/libsingular.so"
-+    if os.path.exists(lib):
-+        handle = dlopen(lib, RTLD_GLOBAL|RTLD_LAZY)
- 
-     if handle == NULL:
-         print dlerror()
 --- a/sage/src/sage/misc/cython.py
 +++ b/sage/src/sage/misc/cython.py
 @@ -68,9 +68,9 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git