Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit d65299c

Browse files
author
Matthias Koeppe
committed
Merge branch 't/29124/script-packages-prereq-toolchain-bootstrap' into t/31064/ci_cygwin__yml__adjust_to_new_script_packages__bootstrap___prereq
2 parents 598b0c2 + 9988c5f commit d65299c

File tree

220 files changed

+3953
-1835
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

220 files changed

+3953
-1835
lines changed

.github/workflows/tox-experimental.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
max-parallel: 6
3838
matrix:
39-
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-focal-i386, debian-buster-i386, centos-7-i386]
39+
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-focal-i386, debian-buster-i386, centos-7-i386]
4040
tox_packages_factor: [maximal]
4141
targets_pattern: [0-g, h-o, p, q-z]
4242
env:

.github/workflows/tox-optional.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
max-parallel: 6
3838
matrix:
39-
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-focal-i386, debian-buster-i386, centos-7-i386]
39+
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-focal-i386, debian-buster-i386, centos-7-i386]
4040
tox_packages_factor: [maximal]
4141
targets_pattern: [0-g, h-o, p, q-z]
4242
env:

.github/workflows/tox.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
max-parallel: 20
3838
matrix:
39-
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7, centos-8, gentoo, gentoo-python3.7, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-focal-i386, debian-buster-i386, centos-7-i386]
39+
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7, centos-8, gentoo, gentoo-python3.7, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-focal-i386, debian-buster-i386, centos-7-i386]
4040
tox_packages_factor: [minimal, standard]
4141
env:
4242
TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}

.zenodo.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"description": "Mirror of the Sage https://sagemath.org/ source tree",
33
"license": "other-open",
4-
"title": "sagemath/sage: 9.3.beta4",
5-
"version": "9.3.beta4",
4+
"title": "sagemath/sage: 9.3.beta5",
5+
"version": "9.3.beta5",
66
"upload_type": "software",
7-
"publication_date": "2020-12-14",
7+
"publication_date": "2020-12-27",
88
"creators": [
99
{
1010
"affiliation": "SageMath.org",
@@ -15,7 +15,7 @@
1515
"related_identifiers": [
1616
{
1717
"scheme": "url",
18-
"identifier": "https://github.com/sagemath/sage/tree/9.3.beta4",
18+
"identifier": "https://github.com/sagemath/sage/tree/9.3.beta5",
1919
"relation": "isSupplementTo"
2020
},
2121
{

VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 9.3.beta4, Release Date: 2020-12-14
1+
SageMath version 9.3.beta5, Release Date: 2020-12-27

build/bin/sage-build-env

+22-6
Original file line numberDiff line numberDiff line change
@@ -49,44 +49,60 @@ fi
4949
if [ "x$ORIGINAL_CFLAGS" == "x" ]; then
5050
# Evaluate SAGE_DEBUG:
5151
if [ "x$SAGE_DEBUG" == "xyes" ]; then
52-
export CFLAGS="-Og -g"
53-
export CFLAGS_O3="-Og -g"
52+
export CFLAGS_NON_NATIVE="-Og -g"
53+
export CFLAGS_O3_NON_NATIVE="-Og -g"
5454
elif [ "x$SAGE_DEBUG" == "xno" ]; then
55-
export CFLAGS="-O2"
56-
export CFLAGS_O3="-O3"
55+
export CFLAGS_NON_NATIVE="-O2"
56+
export CFLAGS_O3_NON_NATIVE="-O3"
5757
else
58-
export CFLAGS="-O2 -g"
59-
export CFLAGS_O3="-O3 -g"
58+
export CFLAGS_NON_NATIVE="-O2 -g"
59+
export CFLAGS_O3_NON_NATIVE="-O3 -g"
6060
fi
61+
export CFLAGS="$CFLAGS_NON_NATIVE $CFLAGS_MARCH"
62+
export CFLAGS_O3="$CFLAGS_O3_NON_NATIVE $CFLAGS_MARCH"
6163
else
6264
# Respect user environment variable.
6365
export CFLAGS="$ORIGINAL_CFLAGS"
6466
export CFLAGS_O3="$ORIGINAL_CFLAGS"
67+
export CFLAGS_NON_NATIVE="$ORIGINAL_CFLAGS"
68+
export CFLAGS_O3_NON_NATIVE="$ORIGINAL_CFLAGS"
6569
fi
6670

6771
# Copy to CXXFLAGS if this is not set.
6872
if [ "x$ORIGINAL_CXXFLAGS" == "x" ]; then
6973
export CXXFLAGS="$CFLAGS"
7074
export CXXFLAGS_O3="$CFLAGS_O3"
75+
export CXXFLAGS_NON_NATIVE="$CFLAGS_NON_NATIVE"
76+
export CXXFLAGS_O3_NON_NATIVE="$CFLAGS_O3_NON_NATIVE"
7177
else
7278
export CXXFLAGS="$ORIGINAL_CXXFLAGS"
7379
export CXXFLAGS_O3="$ORIGINAL_CXXFLAGS"
80+
export CXXFLAGS_NON_NATIVE="$ORIGINAL_CXXFLAGS"
81+
export CXXFLAGS_O3_NON_NATIVE="$ORIGINAL_CXXFLAGS"
7482
fi
7583

7684
# Copy CFLAGS to FCFLAGS if this is not set.
7785
if [ "x$ORIGINAL_FCFLAGS" == "x" ]; then
7886
export FCFLAGS="$CFLAGS"
7987
export FCFLAGS_O3="$CFLAGS_O3"
88+
export FCFLAGS_NON_NATIVE="$CFLAGS_NON_NATIVE"
89+
export FCFLAGS_O3_NON_NATIVE="$CFLAGS_O3_NON_NATIVE"
8090
else
8191
export FCFLAGS="$ORIGINAL_FCFLAGS"
8292
export FCFLAGS_O3="$ORIGINAL_FCFLAGS"
93+
export FCFLAGS_NON_NATIVE="$ORIGINAL_FCFLAGS"
94+
export FCFLAGS_O3_NON_NATIVE="$ORIGINAL_FCFLAGS"
8395
fi
8496

8597
# Copy FCFLAGS to F77FLAGS if this is not set.
8698
if [ "x$ORIGINAL_F77FLAGS" == "x" ]; then
8799
export F77FLAGS="$FCFLAGS"
88100
export F77FLAGS_O3="$FCFLAGS_O3"
101+
export F77FLAGS_NON_NATIVE="$FCFLAGS_NON_NATIVE"
102+
export F77FLAGS_O3_NON_NATIVE="$FCFLAGS_O3_NON_NATIVE"
89103
else
90104
export F77FLAGS="$ORIGINAL_F77FLAGS"
91105
export F77FLAGS_O3="$ORIGINAL_F77FLAGS"
106+
export F77FLAGS_NON_NATIVE="$ORIGINAL_F77FLAGS"
107+
export F77FLAGS_O3_NON_NATIVE="$ORIGINAL_F77FLAGS"
92108
fi

build/bin/sage-build-env-config.in

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ export CONFIGURED_CFLAGS="@CFLAGS@"
3636
export CONFIGURED_CXXFLAGS="@CXXFLAGS@"
3737
export CONFIGURED_FCFLAGS="@FCFLAGS@"
3838
export CONFIGURED_F77FLAGS="@F77FLAGS@"
39+
export CFLAGS_MARCH="@CFLAGS_MARCH@"
3940

4041
# This is usually blank if the system GMP is used, or $SAGE_LOCAL otherwise
4142
export SAGE_GMP_PREFIX="@SAGE_GMP_PREFIX@"

build/bin/sage-site

-10
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,6 @@ if [ "$1" = '-standard' -o "$1" = "--standard" ]; then
128128
exec sage-list-packages standard $@
129129
fi
130130

131-
if [ "$1" = '-installed' -o "$1" = "--installed" ]; then
132-
shift
133-
exec sage-list-packages all --installed-only $@
134-
fi
135-
136-
if [ "$1" = '-p' ]; then
137-
echo "Error: Installing old-style SPKGs is no longer supported."
138-
exit 1
139-
fi
140-
141131
if [ "$1" = '-info' -o "$1" = '--info' ]; then
142132
shift
143133
for PKG in "$@"

build/pkgs/_recommended/distros/debian.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ texlive-xetex
77
# to generate pdf documentation
88
latexmk
99
# to convert Jupyter notebooks to pdf
10-
pandoc
10+
# pandoc -- this is a separate script package
1111
# to render text with LaTeX in Matplotlib
1212
dvipng
1313
# to run the Jmol 3D viewer from the console and generate images for 3D plots in the documentation

build/pkgs/_recommended/distros/homebrew.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# To convert Jupyter notebooks to pdf:
2-
pandoc
2+
# pandoc -- this is a separate script package
33
# To produce animations:
44
ffmpeg
55
imagemagick

build/pkgs/configure/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=bd555cd949f9c99a9d99902c577e13345f5fbc01
3-
md5=a39377025f0bae6d2f026d48ae9b564b
4-
cksum=3175310020
2+
sha1=8ee84baf7b35d5f9969564496caef1d82ac39d58
3+
md5=9b0c40d1b588ebd7b2fc026ed083e8fe
4+
cksum=597282646
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2fc350e432bf89430424a9db1b5e0f4cc88b75e8
1+
0c355ddc523129acf154e6f361a6366058591105

build/pkgs/cycler/SPKG.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ cycler
44
Description
55
-----------
66

7-
Cycler is a small break of of matplotlib to deal with "composable
7+
Cycler is a small break-off of matplotlib to deal with "composable
88
cycles". It is a required dependency of matplotlib 1.5.0.
99

1010
License

build/pkgs/eclib/spkg-install.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
CFLAGS="$CFLAGS_O3"
2-
CXXFLAGS="$CXXFLAGS_O3"
1+
CFLAGS="$CFLAGS_O3_NON_NATIVE"
2+
CXXFLAGS="$CXXFLAGS_O3_NON_NATIVE"
33

44
export CFLAGS CXXFLAGS
55

build/pkgs/fplll/checksums.ini

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=fplll-VERSION.tar.gz
2-
sha1=3ab5e269fdf73b6f933b24db656e5c55d83aa690
3-
md5=31f0f5d2045802d0beb8945dd0fa07f0
4-
cksum=2692708834
5-
upstream_url=https://github.com/fplll/fplll/releases/download/VERSION/fplll-VERSION.tar.gz
2+
sha1=a62fc9aa2a4736e9680a336b092f432c31ddac43
3+
md5=db2f0f46d4de3e8ab8ed73a79d19ffc3
4+
cksum=1237963825
5+
upstream_url=https://github.com/fplll/fplll/releases/download/VERSION/fplll-VERSION.tar.gz

build/pkgs/fplll/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.3.3
1+
5.4.0

build/pkgs/fplll/spkg-configure.m4

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ SAGE_SPKG_CONFIGURE([fplll], [
44
dnl if there's a usable system copy of fplll. Unless there's
55
dnl a system that ships fplll without fplll.pc file, falling
66
dnl back to a manual header/library search is pointless.
7+
dnl
8+
dnl Trac #31025: FPLLL/FPyLLL make no guarantee regarding compatibility
9+
dnl other than "whatever versions were released at the same time should work together"
710
PKG_CHECK_MODULES([FPLLL],
8-
[fplll >= 5.3],
11+
[fplll == 5.4],
912
[sage_spkg_install_fplll=no],
1013
[sage_spkg_install_fplll=yes])
1114
])

build/pkgs/fpylll/checksums.ini

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
tarball=fpylll-VERSION.tar.gz
2-
sha1=b1f2d6eae30ce083c4282384049989fe45bd33cd
3-
md5=95ad1823e15031f12603c8f38acb1477
4-
cksum=2108756831
2+
sha1=4f54d882d2163c54c48a91ea49f9a938227b71c2
3+
md5=c4131f71e72d5ee6d5eec9d77e438c8d
4+
cksum=4098460220
5+
upstream_url=https://github.com/fplll/fpylll/releases/download/VERSION/fpylll-VERSION.tar.gz
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
fpylll >=0.5.1dev
1+
fpylll ==0.5.4

build/pkgs/fpylll/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.5.2dev
1+
0.5.4

build/pkgs/gap/spkg-install.in

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
cd src
66

7+
export CFLAGS=$CFLAGS_NON_NATIVE
8+
export CXXFLAGS=$CXXFLAGS_NON_NATIVE
9+
710
GAP_BUILD_ROOT="$(pwd)"
811
GAP_ROOT="$SAGE_LOCAL/share/gap"
912
DESTDIR_GAP_ROOT="$SAGE_DESTDIR$GAP_ROOT"

build/pkgs/gcc/spkg-configure.m4

+17
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,10 @@ SAGE_SPKG_CONFIGURE_BASE([gcc], [
151151
# Install our own GCC if the system-provided one is newer than 10.x.
152152
# See https://trac.sagemath.org/ticket/29456
153153
SAGE_SHOULD_INSTALL_GCC([$CXX is g++ version $GXX_VERSION, which is too recent for this version of Sage])
154+
],
155+
[4.[[8-9]].*|5.[[0-1]].*], [
156+
# GCC less than 5.1 is not ready for AVX512.
157+
sage_use_march_native=no
154158
])
155159
fi
156160
@@ -201,6 +205,19 @@ SAGE_SPKG_CONFIGURE_BASE([gcc], [
201205
SAGE_SRC="$SAGE_SRC"
202206
])
203207
fi
208+
209+
# Determine which compiler flags should be set.
210+
if test x$sage_use_march_native = xno; then
211+
CFLAGS_MARCH=""
212+
elif test x$SAGE_FAT_BINARY = xyes; then
213+
CFLAGS_MARCH=""
214+
elif test x$sage_spkg_install_gcc = xyes; then
215+
CFLAGS_MARCH="-march=native"
216+
else
217+
AX_CHECK_COMPILE_FLAG("-march=native", [CFLAGS_MARCH="-march=native"], [CFLAGS_MARCH=""], [], [])
218+
fi
219+
AC_SUBST(CFLAGS_MARCH)
220+
204221
], , , [
205222
# Trac #27907: Find location of crti.o from the system CC, in case we build our own gcc
206223
AC_MSG_CHECKING([for the location of crti.o])

build/pkgs/gcc/spkg-install.in

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# If we are building gcc ourselves, usually the system compiler isn't suitable.
2+
export CFLAGS=$CFLAGS_NON_NATIVE
3+
export CXXFLAGS=$CXXFLAGS_NON_NATIVE
4+
15
# First, install any custom binaries or headers we created for macOS
26
# workarounds
37
for dir in bin include; do

build/pkgs/glpk/checksums.ini

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
tarball=glpk-VERSION.tar.bz2
2-
sha1=3509165dd737168250168e8323c91e2a8df67f9d
3-
md5=788f23a0981f3a6dc82fde82f146dd1f
4-
cksum=3267474902
2+
sha1=3a85b1e4c806b91deebfcf9a845b9308cd785d64
3+
md5=91499dc0c139b221846cae60e5c7d222
4+
cksum=1522314071
5+
upstream_url=https://ftp.gnu.org/gnu/glpk/glpk-VERSION.tar.gz

build/pkgs/glpk/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.65.p0
1+
5.0.p0

build/pkgs/glpk/patches/dont_print_Longstepwillbeused.patch

-21
This file was deleted.

build/pkgs/glpk/patches/error_recovery.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ diff --git a/src/env/error.c b/src/env/error.c
66
index a898b76..154de0f 100644
77
--- a/src/env/error.c
88
+++ b/src/env/error.c
9-
@@ -50,6 +50,7 @@ static void errfunc(const char *fmt, ...)
9+
@@ -48,6 +48,7 @@ static void errfunc(const char *fmt, ...)
1010
va_end(arg);
1111
xprintf("Error detected in file %s at line %d\n",
1212
env->err_file, env->err_line);

build/pkgs/gp2c/spkg-configure.m4

+12
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,18 @@ SAGE_SPKG_CONFIGURE([gp2c], [
3838
# by assuming the executable is in e.g. /usr/bin or /usr/local/bin and
3939
# then stripping off the "bin" component of that.
4040
gp_prefix=$(dirname -- "$(dirname -- "$GP")")
41+
42+
# During the great systemd /bin -> /usr/bin merge, there are
43+
# systems where /bin is a symlink to /usr/bin. The real "gp"
44+
# executable lives in /usr/bin, but (in at least one case, trac
45+
# 31051) we find the copy in /bin first. Why Fedora 32 has the
46+
# symlink /bin in front of /usr/bin in their PATH is a question
47+
# I cannot answer; nevertheless, it's pretty easy to add back
48+
# the "usr" here if we determine that the gp prefix is "/",
49+
# which it ain't. This is viable only so long as nobody really
50+
# puts "gp" in /bin, but... they should not.
51+
AS_IF([test "x$gp_prefix" = "x/"], [gp_prefix=/usr])
52+
4153
AC_MSG_NOTICE([gp prefix is $gp_prefix])
4254
4355
# Gentoo: $gp_prefix/share/pari/pari.cfg

build/pkgs/mpfr/spkg-install.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ mpfr_configure()
3636

3737
if [ "$SAGE_DEBUG" = yes ]; then
3838
# Disable optimization, add debug symbols:
39-
required_cflags=$CFLAGS
39+
required_cflags=$CFLAGS_NON_NATIVE
4040
echo >&2 "Warning: Building MPFR with SAGE_DEBUG=yes disables optimization."
4141
else
4242
# Add debug symbols by default, enable optimization, but do not (yet)
4343
# add processor-specific flags (these are eventually added later):
44-
default_cflags=$CFLAGS_O3
44+
default_cflags=$CFLAGS_O3_NON_NATIVE
4545
fi
4646

4747
# Enabling thread-safe (which meanwhile is or at least may be the default)

build/pkgs/openssl/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=openssl-VERSION.tar.gz
2-
sha1=8d0d099e8973ec851368c8c775e05e1eadca1794
3-
md5=53840c70434793127a3574433494e8d3
4-
cksum=1786129461
2+
sha1=eb684ba4ed31fe2c48062aead75233ecd36882a6
3+
md5=08987c3cf125202e2b0840035efb392c
4+
cksum=815486537
55
upstream_url=https://www.openssl.org/source/openssl-VERSION.tar.gz
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.1h
1+
1.1.1i

build/pkgs/pillow/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=Pillow-VERSION.tar.gz
2-
sha1=aa3ea4f9df720f210f9f7c4dde75b247bf76ef61
3-
md5=3da1c992ce9fcc67597d83036f591712
4-
cksum=88669447
2+
sha1=29b0a0e0cac0b407805df5e5906aff0262148399
3+
md5=9889386af9f8d5b9fbd776f3741921d3
4+
cksum=3281054807
55
upstream_url=https://pypi.io/packages/source/p/pillow/Pillow-VERSION.tar.gz

build/pkgs/pillow/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.2.0
1+
8.0.1

build/pkgs/r/spkg-install.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ CPPFLAGS="$CPPFLAGS"
1111
# "for type of 'hidden' Fortran character lengths"
1212
# on ubuntu-bionic-minimal, ubuntu-eoan/focal-minimal, debian-buster/bullseye/sid-minimal,
1313
# linuxmint-19.3-minimal, archlinux-latest-minimal
14-
CFLAGS="$CFLAGS -fPIC"
15-
FCFLAGS="$FCFLAGS -fPIC"
14+
CFLAGS="$CFLAGS_NON_NATIVE -fPIC"
15+
FCFLAGS="$FCFLAGS_NON_NATIVE -fPIC"
1616

1717
export CFLAGS CPPFLAGS FCFLAGS LDFLAGS
1818

build/pkgs/sagelib/distros/conda.txt

-1
This file was deleted.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.3.beta4
1+
9.3.beta5

0 commit comments

Comments
 (0)