mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 19:55:54 -04:00
Version 9.7
Drop upstreamed patches: -infinite-recursion, -use-after-free, -sphinx
This commit is contained in:
Jerry James
parent
fed038c815
commit
bf7a318833
17 changed files with 532 additions and 1033 deletions
|
|
@ -1,39 +1,39 @@
|
|||
diff -up configure.orig configure
|
||||
--- configure.orig 2022-01-30 06:43:09.000000000 -0700
|
||||
+++ configure 2022-03-04 16:30:36.953830625 -0700
|
||||
@@ -16226,12 +16226,12 @@ if test -n "$OPENBLAS_CFLAGS"; then
|
||||
--- configure.orig 2022-09-19 16:39:46.000000000 -0600
|
||||
+++ configure 2023-01-15 19:47:16.551480424 -0700
|
||||
@@ -17604,12 +17604,12 @@ if test -n "$OPENBLAS_CFLAGS"; then
|
||||
pkg_cv_OPENBLAS_CFLAGS="$OPENBLAS_CFLAGS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openblas >= 0.2.20\""; } >&5
|
||||
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openblas >= 0.2.20\""; } >&5
|
||||
- ($PKG_CONFIG --exists --print-errors "openblas >= 0.2.20") 2>&5
|
||||
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flexiblas >= 3.0.0\""; } >&5
|
||||
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flexiblas >= 3.0.0\""; } >&5
|
||||
+ ($PKG_CONFIG --exists --print-errors "flexiblas >= 3.0.0") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
- pkg_cv_OPENBLAS_CFLAGS=`$PKG_CONFIG --cflags "openblas >= 0.2.20" 2>/dev/null`
|
||||
+ pkg_cv_OPENBLAS_CFLAGS=`$PKG_CONFIG --cflags "flexiblas >= 3.0.0" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes
|
||||
else
|
||||
pkg_failed=yes
|
||||
@@ -16243,12 +16243,12 @@ if test -n "$OPENBLAS_LIBS"; then
|
||||
@@ -17621,12 +17621,12 @@ if test -n "$OPENBLAS_LIBS"; then
|
||||
pkg_cv_OPENBLAS_LIBS="$OPENBLAS_LIBS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openblas >= 0.2.20\""; } >&5
|
||||
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openblas >= 0.2.20\""; } >&5
|
||||
- ($PKG_CONFIG --exists --print-errors "openblas >= 0.2.20") 2>&5
|
||||
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flexiblas >= 3.0.0\""; } >&5
|
||||
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flexiblas >= 3.0.0\""; } >&5
|
||||
+ ($PKG_CONFIG --exists --print-errors "flexiblas >= 3.0.0") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
- pkg_cv_OPENBLAS_LIBS=`$PKG_CONFIG --libs "openblas >= 0.2.20" 2>/dev/null`
|
||||
+ pkg_cv_OPENBLAS_LIBS=`$PKG_CONFIG --libs "flexiblas >= 3.0.0" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes
|
||||
else
|
||||
pkg_failed=yes
|
||||
@@ -16269,9 +16269,9 @@ else
|
||||
@@ -17647,9 +17647,9 @@ else
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
|
|
@ -45,27 +45,28 @@ diff -up configure.orig configure
|
|||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$OPENBLAS_PKG_ERRORS" >&5
|
||||
@@ -16299,16 +16299,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
-char openblas_get_config ();
|
||||
+char flexiblas_get_version ();
|
||||
@@ -17673,17 +17673,17 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
|
||||
/* end confdefs.h. */
|
||||
|
||||
namespace conftest {
|
||||
- extern "C" int openblas_get_config ();
|
||||
+ extern "C" int flexiblas_get_version ();
|
||||
}
|
||||
int
|
||||
main ()
|
||||
main (void)
|
||||
{
|
||||
-return openblas_get_config ();
|
||||
+return flexiblas_get_version ();
|
||||
-return conftest::openblas_get_config ();
|
||||
+return conftest::flexiblas_get_version ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-for ac_lib in '' openblas cblas blas; do
|
||||
+for ac_lib in '' flexiblas cblas blas; do
|
||||
-for ac_lib in '' openblas cblas blas
|
||||
+for ac_lib in '' flexiblas cblas blas
|
||||
do
|
||||
if test -z "$ac_lib"; then
|
||||
ac_res="none required"
|
||||
else
|
||||
@@ -16358,22 +16358,22 @@ else
|
||||
@@ -17740,22 +17740,20 @@ else $as_nop
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
@ -73,102 +74,7 @@ diff -up configure.orig configure
|
|||
+ void flexiblas_get_version(void);
|
||||
int version[3];
|
||||
int
|
||||
main ()
|
||||
{
|
||||
version[0] = version[1] = version[2] = 0;
|
||||
/*printf("%s", openblas_get_config());*/
|
||||
- if (sscanf(openblas_get_config(), "OpenBLAS %d.%d.%d",
|
||||
- version, version+1, version+2) < 1)
|
||||
- return 1;
|
||||
+ flexiblas_get_version(&version[0], &version[1], &version[2]);
|
||||
+
|
||||
+
|
||||
if ( 10000 * version[0]
|
||||
+ 100 * version[1]
|
||||
+ version[2]
|
||||
- < 10000 * 0
|
||||
- + 100 * 2
|
||||
- + 20)
|
||||
+ < 10000 * 3
|
||||
+ + 100 * 0
|
||||
+ + 0)
|
||||
return 1;
|
||||
;
|
||||
return 0;
|
||||
@@ -16426,7 +16426,7 @@ return cblas_dgemm ();
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-for ac_lib in '' openblas cblas blas; do
|
||||
+for ac_lib in '' flexiblas cblas blas; do
|
||||
if test -z "$ac_lib"; then
|
||||
ac_res="none required"
|
||||
else
|
||||
@@ -16490,7 +16490,7 @@ return dgeqrf ();
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-for ac_lib in '' openblas lapack; do
|
||||
+for ac_lib in '' flexiblas lapack; do
|
||||
if test -z "$ac_lib"; then
|
||||
ac_res="none required"
|
||||
else
|
||||
@@ -16554,7 +16554,7 @@ return dgeqrf_ ();
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-for ac_lib in '' openblas lapack; do
|
||||
+for ac_lib in '' flexiblas lapack; do
|
||||
if test -z "$ac_lib"; then
|
||||
ac_res="none required"
|
||||
else
|
||||
@@ -16618,7 +16618,7 @@ return DGEQRF ();
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-for ac_lib in '' openblas lapack; do
|
||||
+for ac_lib in '' flexiblas lapack; do
|
||||
if test -z "$ac_lib"; then
|
||||
ac_res="none required"
|
||||
else
|
||||
@@ -16682,7 +16682,7 @@ return DGEQRF_ ();
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-for ac_lib in '' openblas lapack; do
|
||||
+for ac_lib in '' flexiblas lapack; do
|
||||
if test -z "$ac_lib"; then
|
||||
ac_res="none required"
|
||||
else
|
||||
@@ -16770,16 +16770,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
-char openblas_get_config ();
|
||||
+char flexiblas_get_version ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
-return openblas_get_config ();
|
||||
+return flexiblas_get_version ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-for ac_lib in '' openblas cblas blas; do
|
||||
+for ac_lib in '' flexiblas cblas blas; do
|
||||
if test -z "$ac_lib"; then
|
||||
ac_res="none required"
|
||||
else
|
||||
@@ -16829,22 +16829,22 @@ else
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <stdio.h>
|
||||
- char *openblas_get_config(void);
|
||||
+ void flexiblas_get_version(void);
|
||||
int version[3];
|
||||
int
|
||||
main ()
|
||||
main (void)
|
||||
{
|
||||
version[0] = version[1] = version[2] = 0;
|
||||
/*printf("%s", openblas_get_config());*/
|
||||
|
|
@ -176,8 +82,6 @@ diff -up configure.orig configure
|
|||
- version, version+1, version+2) < 1)
|
||||
- return 1;
|
||||
+ flexiblas_get_version(&version[0], &version[1], &version[2]);
|
||||
+
|
||||
+
|
||||
if ( 10000 * version[0]
|
||||
+ 100 * version[1]
|
||||
+ version[2]
|
||||
|
|
@ -190,80 +94,174 @@ diff -up configure.orig configure
|
|||
return 1;
|
||||
;
|
||||
return 0;
|
||||
@@ -16897,7 +16897,7 @@ return cblas_dgemm ();
|
||||
@@ -17806,7 +17804,7 @@ return conftest::cblas_dgemm ();
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-for ac_lib in '' openblas cblas blas; do
|
||||
+for ac_lib in '' flexiblas cblas blas; do
|
||||
-for ac_lib in '' openblas cblas blas
|
||||
+for ac_lib in '' flexiblas cblas blas
|
||||
do
|
||||
if test -z "$ac_lib"; then
|
||||
ac_res="none required"
|
||||
else
|
||||
@@ -16961,7 +16961,7 @@ return dgeqrf ();
|
||||
@@ -17873,7 +17871,7 @@ return conftest::dgeqrf ();
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-for ac_lib in '' openblas lapack; do
|
||||
+for ac_lib in '' flexiblas lapack; do
|
||||
-for ac_lib in '' openblas lapack
|
||||
+for ac_lib in '' flexiblas lapack
|
||||
do
|
||||
if test -z "$ac_lib"; then
|
||||
ac_res="none required"
|
||||
else
|
||||
@@ -17025,7 +17025,7 @@ return dgeqrf_ ();
|
||||
@@ -17940,7 +17938,7 @@ return conftest::dgeqrf_ ();
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-for ac_lib in '' openblas lapack; do
|
||||
+for ac_lib in '' flexiblas lapack; do
|
||||
-for ac_lib in '' openblas lapack
|
||||
+for ac_lib in '' flexiblas lapack
|
||||
do
|
||||
if test -z "$ac_lib"; then
|
||||
ac_res="none required"
|
||||
else
|
||||
@@ -17089,7 +17089,7 @@ return DGEQRF ();
|
||||
@@ -18007,7 +18005,7 @@ return conftest::DGEQRF ();
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-for ac_lib in '' openblas lapack; do
|
||||
+for ac_lib in '' flexiblas lapack; do
|
||||
-for ac_lib in '' openblas lapack
|
||||
+for ac_lib in '' flexiblas lapack
|
||||
do
|
||||
if test -z "$ac_lib"; then
|
||||
ac_res="none required"
|
||||
else
|
||||
@@ -17153,7 +17153,7 @@ return DGEQRF_ ();
|
||||
@@ -18074,7 +18072,7 @@ return conftest::DGEQRF_ ();
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-for ac_lib in '' openblas lapack; do
|
||||
+for ac_lib in '' flexiblas lapack; do
|
||||
-for ac_lib in '' openblas lapack
|
||||
+for ac_lib in '' flexiblas lapack
|
||||
do
|
||||
if test -z "$ac_lib"; then
|
||||
ac_res="none required"
|
||||
else
|
||||
@@ -17228,12 +17228,12 @@ if test -n "$OPENBLASPCDIR"; then
|
||||
@@ -18165,17 +18163,17 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
|
||||
/* end confdefs.h. */
|
||||
|
||||
namespace conftest {
|
||||
- extern "C" int openblas_get_config ();
|
||||
+ extern "C" int flexiblas_get_version ();
|
||||
}
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
-return conftest::openblas_get_config ();
|
||||
+return conftest::flexiblas_get_version ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-for ac_lib in '' openblas cblas blas
|
||||
+for ac_lib in '' flexiblas cblas blas
|
||||
do
|
||||
if test -z "$ac_lib"; then
|
||||
ac_res="none required"
|
||||
@@ -18232,22 +18230,20 @@ else $as_nop
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <stdio.h>
|
||||
- char *openblas_get_config(void);
|
||||
+ void flexiblas_get_version(void);
|
||||
int version[3];
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
version[0] = version[1] = version[2] = 0;
|
||||
/*printf("%s", openblas_get_config());*/
|
||||
- if (sscanf(openblas_get_config(), "OpenBLAS %d.%d.%d",
|
||||
- version, version+1, version+2) < 1)
|
||||
- return 1;
|
||||
+ flexiblas_get_version(&version[0], &version[1], &version[2]);
|
||||
if ( 10000 * version[0]
|
||||
+ 100 * version[1]
|
||||
+ version[2]
|
||||
- < 10000 * 0
|
||||
- + 100 * 2
|
||||
- + 20)
|
||||
+ < 10000 * 3
|
||||
+ + 100 * 0
|
||||
+ + 0)
|
||||
return 1;
|
||||
;
|
||||
return 0;
|
||||
@@ -18298,7 +18294,7 @@ return conftest::cblas_dgemm ();
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-for ac_lib in '' openblas cblas blas
|
||||
+for ac_lib in '' flexiblas cblas blas
|
||||
do
|
||||
if test -z "$ac_lib"; then
|
||||
ac_res="none required"
|
||||
@@ -18365,7 +18361,7 @@ return conftest::dgeqrf ();
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-for ac_lib in '' openblas lapack
|
||||
+for ac_lib in '' flexiblas lapack
|
||||
do
|
||||
if test -z "$ac_lib"; then
|
||||
ac_res="none required"
|
||||
@@ -18432,7 +18428,7 @@ return conftest::dgeqrf_ ();
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-for ac_lib in '' openblas lapack
|
||||
+for ac_lib in '' flexiblas lapack
|
||||
do
|
||||
if test -z "$ac_lib"; then
|
||||
ac_res="none required"
|
||||
@@ -18499,7 +18495,7 @@ return conftest::DGEQRF ();
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-for ac_lib in '' openblas lapack
|
||||
+for ac_lib in '' flexiblas lapack
|
||||
do
|
||||
if test -z "$ac_lib"; then
|
||||
ac_res="none required"
|
||||
@@ -18566,7 +18562,7 @@ return conftest::DGEQRF_ ();
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-for ac_lib in '' openblas lapack
|
||||
+for ac_lib in '' flexiblas lapack
|
||||
do
|
||||
if test -z "$ac_lib"; then
|
||||
ac_res="none required"
|
||||
@@ -18648,12 +18644,12 @@ if test -n "$OPENBLASPCDIR"; then
|
||||
pkg_cv_OPENBLASPCDIR="$OPENBLASPCDIR"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openblas\""; } >&5
|
||||
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openblas\""; } >&5
|
||||
- ($PKG_CONFIG --exists --print-errors "openblas") 2>&5
|
||||
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flexiblas\""; } >&5
|
||||
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flexiblas\""; } >&5
|
||||
+ ($PKG_CONFIG --exists --print-errors "flexiblas") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
- pkg_cv_OPENBLASPCDIR=`$PKG_CONFIG --variable="pcfiledir" "openblas" 2>/dev/null`
|
||||
+ pkg_cv_OPENBLASPCDIR=`$PKG_CONFIG --variable="pcfiledir" "flexiblas" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes
|
||||
else
|
||||
pkg_failed=yes
|
||||
@@ -17448,7 +17448,7 @@ fi
|
||||
if test x$sage_spkg_install_openblas != xyes; then :
|
||||
@@ -18876,7 +18872,7 @@ fi
|
||||
then :
|
||||
|
||||
|
||||
- SAGE_OPENBLAS_PC_COMMAND="\$(LN) -sf \"$OPENBLASPCDIR/openblas.pc\" \"\$(@)\""
|
||||
+ SAGE_OPENBLAS_PC_COMMAND="\$(LN) -sf \"$OPENBLASPCDIR/flexiblas.pc\" \"\$(@)\""
|
||||
|
||||
|
||||
if test x$sage_install_blas_pc = xyes; then :
|
||||
if test x$sage_install_blas_pc = xyes
|
||||
diff -up src/sage/env.py.orig src/sage/env.py
|
||||
--- src/sage/env.py.orig 2022-03-04 16:23:09.566306142 -0700
|
||||
+++ src/sage/env.py 2022-03-04 16:30:36.953830625 -0700
|
||||
@@ -221,7 +221,7 @@ FOURTITWO_PPI = var("FOURTITWO_PPI")
|
||||
--- src/sage/env.py.orig 2023-01-15 17:21:15.296585738 -0700
|
||||
+++ src/sage/env.py 2023-01-15 17:22:34.106086752 -0700
|
||||
@@ -222,7 +222,7 @@ FOURTITWO_PPI = var("FOURTITWO_PPI")
|
||||
FOURTITWO_CIRCUITS = var("FOURTITWO_CIRCUITS")
|
||||
FOURTITWO_GROEBNER = var("FOURTITWO_GROEBNER")
|
||||
ARB_LIBRARY = var("ARB_LIBRARY", "arb")
|
||||
|
|
@ -272,7 +270,7 @@ 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")
|
||||
@@ -467,7 +467,7 @@ def cython_aliases(required_modules=None
|
||||
@@ -478,7 +478,7 @@ def cython_aliases(required_modules=None
|
||||
for lib, required in itertools.chain(((lib, True) for lib in required_modules),
|
||||
((lib, False) for lib in optional_modules)):
|
||||
var = lib.upper().replace("-", "") + "_"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue