zyppe/sagemath
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/sagemath.git synced 2025-04-22 11:45:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update to sagemath 7.4

Browse source
This commit is contained in:
pcpa 2016-12-30 10:04:34 -05:00
parent 6b381937c4
commit 807c53b3b6
21 changed files with 299 additions and 2458 deletions
Download patch file Download diff file Expand all files Collapse all files

40
sagemath-rpmbuild.patch
View file

@ -1,6 +1,6 @@
diff -up src/module_list.py.orig src/module_list.py
--- src/module_list.py.orig 2016-08-08 13:18:16.519494566 -0400
+++ src/module_list.py 2016-08-08 13:18:29.570495066 -0400
--- src/module_list.py.orig 2016-10-20 08:01:32.743523078 -0400
+++ src/module_list.py 2016-10-20 08:01:43.593523493 -0400
@@ -3,7 +3,7 @@ from glob import glob
from distutils.extension import Extension
from sage.env import SAGE_LOCAL
@ -10,10 +10,22 @@ diff -up src/module_list.py.orig src/module_list.py
#########################################################
### pkg-config setup
diff -up src/sage/misc/cython.py.orig src/sage/misc/cython.py
--- src/sage/misc/cython.py.orig 2016-10-20 08:03:03.079526537 -0400
+++ src/sage/misc/cython.py 2016-10-20 08:03:18.761527138 -0400
@@ -433,7 +433,7 @@ extra_compile_args = %s
ext_modules = [Extension('%s', sources=['%s.%s', %s],
libraries=%s,
- library_dirs=[SAGE_LOCAL + '/lib/'] + %s,
+ library_dirs=[os.path.realpath(SAGE_LOCAL + '/lib/')] + %s,
extra_compile_args = extra_compile_args,
language = '%s' )]
diff -up src/setup.py.orig src/setup.py
--- src/setup.py.orig 2016-08-08 13:19:09.383496590 -0400
+++ src/setup.py 2016-08-08 13:20:41.161500105 -0400
@@ -561,11 +561,9 @@ def run_cythonize():
--- src/setup.py.orig 2016-10-20 08:01:54.264523902 -0400
+++ src/setup.py 2016-10-20 08:02:33.449525402 -0400
@@ -584,11 +584,9 @@ def run_cythonize():
print('Enabling Cython profiling support')
profile = True
@ -26,8 +38,8 @@ diff -up src/setup.py.orig src/setup.py
+ Cython.Compiler.Main.default_options['cache'] = True
force = True
version_file = os.path.join(os.path.dirname(__file__), '.cython_version')
@@ -618,21 +616,6 @@ print("Discovered Python/Cython sources,
version_file = os.path.join(SAGE_CYTHONIZED, '.cython_version')
@@ -641,21 +639,6 @@ print("Discovered Python/Cython sources,
#########################################################
@ -37,7 +49,7 @@ diff -up src/setup.py.orig src/setup.py
-print('Cleaning up stale installed files....')
-t = time.time()
-from sage_setup.clean import clean_install_dir
-output_dirs = SITE_PACKAGES + glob.glob(os.path.join(SAGE_SRC, 'build', 'lib*'))
-output_dirs = SITE_PACKAGES + glob.glob(os.path.join(build_base, 'lib*'))
-for output_dir in output_dirs:
- print('- cleaning {0}'.format(output_dir))
- clean_install_dir(output_dir, python_packages, python_modules,
@ -49,15 +61,3 @@ diff -up src/setup.py.orig src/setup.py
### Install also Jupyter kernel spec
#########################################################
diff -up src/sage/misc/cython.py.orig src/sage/misc/cython.py
--- src/sage/misc/cython.py.orig 2016-08-24 11:51:48.802265784 -0400
+++ src/sage/misc/cython.py 2016-08-24 11:52:36.723267619 -0400
@@ -426,7 +426,7 @@ extra_compile_args = %s
ext_modules = [Extension('%s', sources=['%s.%s', %s],
libraries=%s,
- library_dirs=[SAGE_LOCAL + '/lib/'] + %s,
+ library_dirs=[os.path.realpath(SAGE_LOCAL + '/lib/')] + %s,
extra_compile_args = extra_compile_args,
language = '%s' )]