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 for split GAP tree

Browse source 
- Add patch for FTBFS with latest giac (see bz 2160197)
- Fix eclib detection
- Add BR on pcre-devel
- Add BR on texlive-tex-gyre
- Rebuild for libfplll 5.4.4
This commit is contained in:
Jerry James 2023-01-13 10:16:25 -07:00
parent 98d6f9fdd6
commit fed038c815
4 changed files with 129 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

95
sagemath-giac.patch Normal file
View file

@ -0,0 +1,95 @@
--- build/pkgs/giac/spkg-configure.m4.orig 2022-05-15 16:11:10.000000000 -0600
+++ build/pkgs/giac/spkg-configure.m4 2023-01-11 11:45:33.450425286 -0700
@@ -2,7 +2,7 @@ SAGE_SPKG_CONFIGURE([giac], [
SAGE_SPKG_DEPCHECK([pari], [
dnl giac does not seem to reveal its patchlevel
m4_pushdef([GIAC_MIN_VERSION], [1.5.0])
- m4_pushdef([GIAC_MAX_VERSION], [1.7.999])
+ m4_pushdef([GIAC_MAX_VERSION], [1.9.999])
AC_CACHE_CHECK([for giac >= ]GIAC_MIN_VERSION[, <= ]GIAC_MAX_VERSION, [ac_cv_path_GIAC], [
AC_PATH_PROGS_FEATURE_CHECK([GIAC], [giac], [
giac_version=$($ac_path_GIAC --version 2> /dev/null | tail -1)
@@ -21,7 +21,7 @@ SAGE_SPKG_CONFIGURE([giac], [
AC_CHECK_HEADER([giac/giac.h], [
AC_SEARCH_LIBS([ConvertUTF16toUTF8], [giac], [
], [sage_spkg_install_giac=yes])
- ], [sage_spkg_install_giac=yes])
+ ], [sage_spkg_install_giac=yes], [typedef unsigned char uchar;])
m4_popdef([GIAC_MIN_VERSION])
])
])
--- configure.orig 2022-05-15 16:12:35.000000000 -0600
+++ configure 2023-01-11 12:07:02.062263416 -0700
@@ -24488,8 +24488,8 @@ $as_echo "no" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for giac >= 1.5.0, <= 1.7.999" >&5
-$as_echo_n "checking for giac >= 1.5.0, <= 1.7.999... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for giac >= 1.5.0, <= 1.9.999" >&5
+$as_echo_n "checking for giac >= 1.5.0, <= 1.9.999... " >&6; }
if ${ac_cv_path_GIAC+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -24562,7 +24562,7 @@ x$ax_compare_version_B" | sed 's/^ *//'
-e 's/[^0-9]//g'`
- ax_compare_version_B=`echo "1.7.999" | sed -e 's/\([0-9]*\)/Z\1Z/g' \
+ ax_compare_version_B=`echo "1.9.999" | sed -e 's/\([0-9]*\)/Z\1Z/g' \
-e 's/Z\([0-9]\)Z/Z0\1Z/g' \
-e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \
-e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \
@@ -24606,7 +24606,8 @@ $as_echo "$ac_cv_path_GIAC" >&6; }
if test -z "$ac_cv_path_GIAC"; then :
sage_spkg_install_giac=yes
fi
- ac_fn_cxx_check_header_mongrel "$LINENO" "giac/giac.h" "ac_cv_header_giac_giac_h" "$ac_includes_default"
+ ac_fn_cxx_check_header_mongrel "$LINENO" "giac/giac.h" "ac_cv_header_giac_giac_h" "typedef unsigned char uchar;
+$ac_includes_default"
if test "x$ac_cv_header_giac_giac_h" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ConvertUTF16toUTF8" >&5
--- src/sage/libs/giac/giac.pxd.orig 2022-05-15 16:11:11.000000000 -0600
+++ src/sage/libs/giac/giac.pxd 2023-01-11 13:45:10.696009927 -0700
@@ -12,6 +12,11 @@
from sage.libs.gmp.mpz cimport mpz_t, mpz_set
from libcpp.string cimport string
+cdef extern from *:
+ """
+ typedef unsigned char uchar;
+ """
+
cdef extern from "giac/giac.h" namespace "giac":
cdef cppclass context:
context()
--- src/sage/libs/giac/misc.h.orig 2022-05-15 16:11:11.000000000 -0600
+++ src/sage/libs/giac/misc.h 2023-01-11 11:13:01.163906686 -0700
@@ -1,5 +1,6 @@
#ifndef GIACPYMISC_H
#define GIACPYMISC_H
+typedef unsigned char uchar;
#include <giac/giac.h>
#include <fstream>
--- src/sage/symbolic/ginac/mpoly-giac.cpp.orig 2022-05-15 16:11:11.000000000 -0600
+++ src/sage/symbolic/ginac/mpoly-giac.cpp 2023-01-11 11:13:57.739878881 -0700
@@ -44,6 +44,7 @@
#include "function.h"
#include "utils.h"
+typedef unsigned char uchar;
#include <giac/global.h>
#include <giac/gausspol.h>
--- src/sage/symbolic/ginac/numeric.cpp.orig 2022-05-15 16:11:11.000000000 -0600
+++ src/sage/symbolic/ginac/numeric.cpp 2023-01-11 11:14:43.876040741 -0700
@@ -78,6 +78,7 @@
#undef _POSIX_C_SOURCE
#undef _XOPEN_SOURCE
+typedef unsigned char uchar;
#include <giac/global.h>
#include <giac/gausspol.h>
#include <giac/fraction.h>