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

Version 9.4.

Browse source 
- 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
Download patch file Download diff file Expand all files Collapse all files

56
sagemath-flexiblas.patch
View file

@ -1,7 +1,7 @@
diff -up configure.orig configure
--- configure.orig 2021-05-09 16:01:38.000000000 -0600
+++ configure 2021-06-03 06:44:51.137915577 -0600
@@ -12184,12 +12184,12 @@ if test -n "$OPENBLAS_CFLAGS"; then
--- configure.orig 2021-08-22 02:45:52.000000000 -0600
+++ configure 2021-08-26 13:40:30.029000877 -0600
@@ -12703,12 +12703,12 @@ if test -n "$OPENBLAS_CFLAGS"; then
pkg_cv_OPENBLAS_CFLAGS="$OPENBLAS_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@ -17,7 +17,7 @@ diff -up configure.orig configure
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -12201,12 +12201,12 @@ if test -n "$OPENBLAS_LIBS"; then
@@ -12720,12 +12720,12 @@ if test -n "$OPENBLAS_LIBS"; then
pkg_cv_OPENBLAS_LIBS="$OPENBLAS_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@ -33,7 +33,7 @@ diff -up configure.orig configure
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -12227,9 +12227,9 @@ else
@@ -12746,9 +12746,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@ -45,7 +45,7 @@ diff -up configure.orig configure
fi
# Put the nasty error message in config.log where it belongs
echo "$OPENBLAS_PKG_ERRORS" >&5
@@ -12257,16 +12257,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
@@ -12776,16 +12776,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
#ifdef __cplusplus
extern "C"
#endif
@ -65,7 +65,7 @@ diff -up configure.orig configure
if test -z "$ac_lib"; then
ac_res="none required"
else
@@ -12319,22 +12319,22 @@ else
@@ -12835,22 +12835,22 @@ else
/* end confdefs.h. */
#include <stdio.h>
@ -95,7 +95,7 @@ diff -up configure.orig configure
return 1;
;
return 0;
@@ -12387,7 +12387,7 @@ return cblas_dgemm ();
@@ -12903,7 +12903,7 @@ return cblas_dgemm ();
return 0;
}
_ACEOF
@ -104,7 +104,7 @@ diff -up configure.orig configure
if test -z "$ac_lib"; then
ac_res="none required"
else
@@ -12451,7 +12451,7 @@ return dgeqrf ();
@@ -12967,7 +12967,7 @@ return dgeqrf ();
return 0;
}
_ACEOF
@ -113,7 +113,7 @@ diff -up configure.orig configure
if test -z "$ac_lib"; then
ac_res="none required"
else
@@ -12515,7 +12515,7 @@ return dgeqrf_ ();
@@ -13031,7 +13031,7 @@ return dgeqrf_ ();
return 0;
}
_ACEOF
@ -122,7 +122,7 @@ diff -up configure.orig configure
if test -z "$ac_lib"; then
ac_res="none required"
else
@@ -12579,7 +12579,7 @@ return DGEQRF ();
@@ -13095,7 +13095,7 @@ return DGEQRF ();
return 0;
}
_ACEOF
@ -131,7 +131,7 @@ diff -up configure.orig configure
if test -z "$ac_lib"; then
ac_res="none required"
else
@@ -12643,7 +12643,7 @@ return DGEQRF_ ();
@@ -13159,7 +13159,7 @@ return DGEQRF_ ();
return 0;
}
_ACEOF
@ -140,7 +140,7 @@ diff -up configure.orig configure
if test -z "$ac_lib"; then
ac_res="none required"
else
@@ -12731,16 +12731,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
@@ -13247,16 +13247,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
#ifdef __cplusplus
extern "C"
#endif
@ -160,7 +160,7 @@ diff -up configure.orig configure
if test -z "$ac_lib"; then
ac_res="none required"
else
@@ -12793,22 +12793,22 @@ else
@@ -13306,22 +13306,22 @@ else
/* end confdefs.h. */
#include <stdio.h>
@ -190,7 +190,7 @@ diff -up configure.orig configure
return 1;
;
return 0;
@@ -12861,7 +12861,7 @@ return cblas_dgemm ();
@@ -13374,7 +13374,7 @@ return cblas_dgemm ();
return 0;
}
_ACEOF
@ -199,7 +199,7 @@ diff -up configure.orig configure
if test -z "$ac_lib"; then
ac_res="none required"
else
@@ -12925,7 +12925,7 @@ return dgeqrf ();
@@ -13438,7 +13438,7 @@ return dgeqrf ();
return 0;
}
_ACEOF
@ -208,7 +208,7 @@ diff -up configure.orig configure
if test -z "$ac_lib"; then
ac_res="none required"
else
@@ -12989,7 +12989,7 @@ return dgeqrf_ ();
@@ -13502,7 +13502,7 @@ return dgeqrf_ ();
return 0;
}
_ACEOF
@ -217,7 +217,7 @@ diff -up configure.orig configure
if test -z "$ac_lib"; then
ac_res="none required"
else
@@ -13053,7 +13053,7 @@ return DGEQRF ();
@@ -13566,7 +13566,7 @@ return DGEQRF ();
return 0;
}
_ACEOF
@ -226,7 +226,7 @@ diff -up configure.orig configure
if test -z "$ac_lib"; then
ac_res="none required"
else
@@ -13117,7 +13117,7 @@ return DGEQRF_ ();
@@ -13630,7 +13630,7 @@ return DGEQRF_ ();
return 0;
}
_ACEOF
@ -235,7 +235,7 @@ diff -up configure.orig configure
if test -z "$ac_lib"; then
ac_res="none required"
else
@@ -13192,12 +13192,12 @@ if test -n "$OPENBLASPCDIR"; then
@@ -13705,12 +13705,12 @@ if test -n "$OPENBLASPCDIR"; then
pkg_cv_OPENBLASPCDIR="$OPENBLASPCDIR"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@ -251,7 +251,7 @@ diff -up configure.orig configure
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -13412,7 +13412,7 @@ fi
@@ -13925,7 +13925,7 @@ fi
if test x$sage_spkg_install_openblas != xyes; then :
@ -261,10 +261,10 @@ diff -up configure.orig configure
if test x$sage_install_blas_pc = xyes; then :
diff -up src/sage/env.py.orig src/sage/env.py
--- src/sage/env.py.orig 2021-06-16 13:13:15.378722205 -0600
+++ src/sage/env.py 2021-06-16 13:42:26.443996772 -0600
@@ -209,7 +209,7 @@ MAXIMA = var("MAXIMA", "maxima")
MAXIMA_FAS = var("MAXIMA_FAS")
--- src/sage/env.py.orig 2021-08-26 13:39:46.040938448 -0600
+++ src/sage/env.py 2021-08-26 13:40:30.029000877 -0600
@@ -212,7 +212,7 @@ MAXIMA_FAS = var("MAXIMA_FAS")
KENZO_FAS = var("KENZO_FAS")
SAGE_NAUTY_BINS_PREFIX = var("SAGE_NAUTY_BINS_PREFIX", "")
ARB_LIBRARY = var("ARB_LIBRARY", "arb")
-CBLAS_PC_MODULES = var("CBLAS_PC_MODULES", "cblas:openblas:blas")
@ -272,9 +272,9 @@ diff -up src/sage/env.py.orig src/sage/env.py
ECL_CONFIG = var("ECL_CONFIG", "ecl-config")
NTL_INCDIR = var("NTL_INCDIR")
NTL_LIBDIR = var("NTL_LIBDIR")
@@ -408,7 +408,7 @@ def cython_aliases():
for lib in ['fflas-ffpack', 'givaro', 'gsl', 'linbox', 'Singular',
'libpng', 'gdlib', 'm4ri', 'zlib', 'cblas', 'lapack']:
@@ -456,7 +456,7 @@ def cython_aliases(required_modules=('ff
for lib, required in itertools.chain(((lib, True) for lib in required_modules),
((lib, False) for lib in optional_modules)):
var = lib.upper().replace("-", "") + "_"
- if lib == 'cblas':
+ if lib == 'cblas' or lib == 'lapack':