Version 9.4.

- Drop upstreamed -eclib patch.
- Drop unnecessary -readonly patch.
- Unbundle ipywidgets.
- Bundle memory_allocator for now.
This commit is contained in:
Jerry James 2021-08-27 13:18:01 -06:00
parent db8b5a20c1
commit 916819fe9b
11 changed files with 390 additions and 482 deletions

View file

@ -1,12 +1,12 @@
diff -up src/sage/misc/cython.py.orig src/sage/misc/cython.py
--- src/sage/misc/cython.py.orig 2021-05-09 16:00:11.000000000 -0600
+++ src/sage/misc/cython.py 2021-05-28 11:28:14.608518654 -0600
@@ -53,7 +53,7 @@ def _standard_libs_libdirs_incdirs_alias
'ec', 'gsl',
] + aliases["CBLAS_LIBRARIES"] + [
--- src/sage/misc/cython.py.orig 2021-08-26 13:10:09.114735665 -0600
+++ src/sage/misc/cython.py 2021-08-26 13:11:01.734797359 -0600
@@ -55,7 +55,7 @@ def _standard_libs_libdirs_incdirs_alias
'ntl']
- standard_libdirs = [os.path.join(SAGE_LOCAL, "lib")] + aliases["CBLAS_LIBDIR"] + aliases["NTL_LIBDIR"]
+ standard_libdirs = [os.path.realpath(os.path.join(SAGE_LOCAL, "lib"))] + aliases["CBLAS_LIBDIR"] + aliases["NTL_LIBDIR"]
standard_libdirs = []
if SAGE_LOCAL:
- standard_libdirs.append(os.path.join(SAGE_LOCAL, "lib"))
+ standard_libdirs.append(os.path.realpath(os.path.join(SAGE_LOCAL, "lib")))
standard_libdirs.extend(aliases["CBLAS_LIBDIR"] + aliases["NTL_LIBDIR"])
standard_incdirs = sage_include_directories() + aliases["CBLAS_INCDIR"] + aliases["NTL_INCDIR"]
return standard_libs, standard_libdirs, standard_incdirs, aliases