From 57a457164f8b533fae58c023e46e695143d0d9cb Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 6 Nov 2021 18:52:55 -0700 Subject: [PATCH 1/9] build/pkgs/setuptools/patches/0001-setuptools-_distutils-ccompiler.py-CCompiler.has_fun.patch: New --- ...utils-ccompiler.py-CCompiler.has_fun.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 build/pkgs/setuptools/patches/0001-setuptools-_distutils-ccompiler.py-CCompiler.has_fun.patch diff --git a/build/pkgs/setuptools/patches/0001-setuptools-_distutils-ccompiler.py-CCompiler.has_fun.patch b/build/pkgs/setuptools/patches/0001-setuptools-_distutils-ccompiler.py-CCompiler.has_fun.patch new file mode 100644 index 00000000000..da906442195 --- /dev/null +++ b/build/pkgs/setuptools/patches/0001-setuptools-_distutils-ccompiler.py-CCompiler.has_fun.patch @@ -0,0 +1,29 @@ +From 423db96cf071ad9e96327e98afac6ace55dd41a5 Mon Sep 17 00:00:00 2001 +From: Matthias Koeppe +Date: Sat, 6 Nov 2021 18:50:14 -0700 +Subject: [PATCH] setuptools/_distutils/ccompiler.py (CCompiler.has_function): + Do not fail if self.outputdir is set + +--- + setuptools/_distutils/ccompiler.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/setuptools/_distutils/ccompiler.py b/setuptools/_distutils/ccompiler.py +index 48d160d2..5697f045 100644 +--- a/setuptools/_distutils/ccompiler.py ++++ b/setuptools/_distutils/ccompiler.py +@@ -802,7 +802,10 @@ int main (int argc, char **argv) { + except (LinkError, TypeError): + return False + else: +- os.remove("a.out") ++ output_dir = self.output_dir ++ if output_dir is None: ++ output_dir = '' ++ os.remove(os.path.join(output_dir, "a.out")) + finally: + for fn in objects: + os.remove(fn) +-- +2.33.0 + From fb48e082f7b30942aeaa3b3fe6a3ba407ebc8e4d Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 6 Nov 2021 19:09:40 -0700 Subject: [PATCH 2/9] build/pkgs/pyzmq/spkg-install.in: Do not overwrite library_dirs, include_dirs here, instead use zmq_prefix --- build/pkgs/pyzmq/spkg-install.in | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/build/pkgs/pyzmq/spkg-install.in b/build/pkgs/pyzmq/spkg-install.in index 0ce404ee5a0..4f469e35307 100644 --- a/build/pkgs/pyzmq/spkg-install.in +++ b/build/pkgs/pyzmq/spkg-install.in @@ -1,17 +1,11 @@ -# Since we use environment vars we have to generate setup.cfg - -echo "[build_ext]" > src/setup.cfg - -# (I tried putting quotes around $SAGE_LOCAL to allow for spaces in -# the path---which is never used but is a good habit to support---but -# that simply does not work. Sorry.) - -echo "library_dirs = $SAGE_LOCAL/lib/" >> src/setup.cfg -echo "include_dirs = $SAGE_LOCAL/include/" >> src/setup.cfg - -echo "[configure]" >> src/setup.cfg - cd src +# Generate setup.cfg +cat > setup.cfg < Date: Sat, 6 Nov 2021 19:10:28 -0700 Subject: [PATCH 3/9] build/pkgs/setuptools: Instead of bumping the patch level, upgrade to 58.5.3 --- build/pkgs/setuptools/checksums.ini | 6 +++--- build/pkgs/setuptools/package-version.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pkgs/setuptools/checksums.ini b/build/pkgs/setuptools/checksums.ini index 6a280871e78..c455cc2a840 100644 --- a/build/pkgs/setuptools/checksums.ini +++ b/build/pkgs/setuptools/checksums.ini @@ -1,5 +1,5 @@ tarball=setuptools-VERSION.tar.gz -sha1=5d97de0e774b2269c85685a4aa8fd5956bcfd2bb -md5=ff20ab7e0d51c5ad0a9438c50e598c06 -cksum=3564252314 +sha1=29004bc6d5a192580f562f4ff24ac164fb722ac5 +md5=04402d15308fb70de2de4a1c537ade1f +cksum=92264041 upstream_url=https://pypi.io/packages/source/s/setuptools/setuptools-VERSION.tar.gz diff --git a/build/pkgs/setuptools/package-version.txt b/build/pkgs/setuptools/package-version.txt index e6ea6360512..15764b0eec8 100644 --- a/build/pkgs/setuptools/package-version.txt +++ b/build/pkgs/setuptools/package-version.txt @@ -1 +1 @@ -58.2.0 +58.5.3 From 129d0fbd15736ebf8d547620f4a27e93ca431eb7 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 6 Nov 2021 19:15:18 -0700 Subject: [PATCH 4/9] build/pkgs/pyzmq/spkg-install.in: Fix up --- build/pkgs/pyzmq/spkg-install.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/pyzmq/spkg-install.in b/build/pkgs/pyzmq/spkg-install.in index 4f469e35307..069d87767f8 100644 --- a/build/pkgs/pyzmq/spkg-install.in +++ b/build/pkgs/pyzmq/spkg-install.in @@ -3,7 +3,7 @@ cd src # Generate setup.cfg cat > setup.cfg < Date: Sat, 6 Nov 2021 19:16:50 -0700 Subject: [PATCH 5/9] build/pkgs/pyzmq: Update to 22.3.0 --- build/pkgs/pyzmq/checksums.ini | 6 +++--- build/pkgs/pyzmq/package-version.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pkgs/pyzmq/checksums.ini b/build/pkgs/pyzmq/checksums.ini index 3824fd2ce94..20509db618b 100644 --- a/build/pkgs/pyzmq/checksums.ini +++ b/build/pkgs/pyzmq/checksums.ini @@ -1,5 +1,5 @@ tarball=pyzmq-VERSION.tar.gz -sha1=50abf6482a6395f15dce0b2774021e12c9f4faad -md5=f261acf884460e93d30f7113c8e9242e -cksum=1661206741 +sha1=d8bb8cb345c0bfd9e67a95ac796bf4b10354dde6 +md5=ecf13c72fbea05ba5ddc771295409d48 +cksum=1680251717 upstream_url=https://pypi.io/packages/source/p/pyzmq/pyzmq-VERSION.tar.gz diff --git a/build/pkgs/pyzmq/package-version.txt b/build/pkgs/pyzmq/package-version.txt index 0398faf11c2..8326e27f9b6 100644 --- a/build/pkgs/pyzmq/package-version.txt +++ b/build/pkgs/pyzmq/package-version.txt @@ -1 +1 @@ -22.2.1 +22.3.0 From fc116124dfa4790bdd829f2b8518cf076adb4e49 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 6 Nov 2021 19:19:13 -0700 Subject: [PATCH 6/9] build/pkgs/zeromq: Update to 4.3.4, add upstream_url --- build/pkgs/zeromq/checksums.ini | 7 ++++--- build/pkgs/zeromq/package-version.txt | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build/pkgs/zeromq/checksums.ini b/build/pkgs/zeromq/checksums.ini index ea8c36bce53..dc802612ddd 100644 --- a/build/pkgs/zeromq/checksums.ini +++ b/build/pkgs/zeromq/checksums.ini @@ -1,4 +1,5 @@ tarball=zeromq-VERSION.tar.gz -sha1=1132f839d703486c4ee1cf22f056585dfbb329c2 -md5=a1c95b34384257e986842f4d006957b8 -cksum=136261411 +sha1=47277a64749049123d1401600e8cfbab10a3ae28 +md5=c897d4005a3f0b8276b00b7921412379 +cksum=1500782345 +upstream_url=https://github.com/zeromq/libzmq/releases/download/vVERSION/zeromq-VERSION.tar.gz diff --git a/build/pkgs/zeromq/package-version.txt b/build/pkgs/zeromq/package-version.txt index df0228dfaec..eda862a98c1 100644 --- a/build/pkgs/zeromq/package-version.txt +++ b/build/pkgs/zeromq/package-version.txt @@ -1 +1 @@ -4.2.5 +4.3.4 From a8fe9da95f28efc4b3bf975a997ce6da05c928bf Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 6 Nov 2021 19:26:07 -0700 Subject: [PATCH 7/9] build/pkgs/zeromq/patches/getrandom.patch: Remove --- build/pkgs/zeromq/patches/getrandom.patch | 39 ----------------------- 1 file changed, 39 deletions(-) delete mode 100644 build/pkgs/zeromq/patches/getrandom.patch diff --git a/build/pkgs/zeromq/patches/getrandom.patch b/build/pkgs/zeromq/patches/getrandom.patch deleted file mode 100644 index e665114e1cb..00000000000 --- a/build/pkgs/zeromq/patches/getrandom.patch +++ /dev/null @@ -1,39 +0,0 @@ -Patch taken from upstream git repo -and after running aclocal && autoconf -and removing changes to autotools input files - -commit 4ff814f204ee38177a392526cf12c8c0019b480f -Author: Luca Boccassi -Date: Wed May 9 10:41:20 2018 +0100 - - Problem: getrandom test does not check if it's working - - Solution: check return value in autoconf and CMake. On some platforms - the function is available but not implemented (eg: GNU/Hurd). - -diff -ru zeromq-4.2.5//builds/cmake/Modules/ZMQSourceRunChecks.cmake b/builds/cmake/Modules/ZMQSourceRunChecks.cmake ---- zeromq-4.2.5//builds/cmake/Modules/ZMQSourceRunChecks.cmake 2018-03-23 20:33:36.000000000 +0100 -+++ b/builds/cmake/Modules/ZMQSourceRunChecks.cmake 2018-07-24 12:39:23.340035053 +0200 -@@ -287,7 +287,8 @@ - int main (int argc, char *argv []) - { - char buf[4]; -- getrandom(buf, 4, 0); -+ int rc = getrandom(buf, 4, 0); -+ return rc == -1 ? 1 : 0; - } - " - ZMQ_HAVE_GETRANDOM) -diff -ru zeromq-4.2.5//configure b/configure ---- zeromq-4.2.5//configure 2018-03-23 20:34:18.000000000 +0100 -+++ b/configure 2018-07-24 12:39:49.018035120 +0200 -@@ -23315,7 +23315,8 @@ - int main (int argc, char *argv []) - { - char buf[4]; -- getrandom(buf, 4, 0); -+ int rc = getrandom(buf, 4, 0); -+ return rc == -1 ? 1 : 0; - } - - _ACEOF From 078e37bbcc8825841a80c9118a1d0598c01d78c8 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 14 Nov 2021 18:19:10 -0800 Subject: [PATCH 8/9] build/pkgs/setuptools: Update to 59.1.0, remove patch --- build/pkgs/setuptools/checksums.ini | 6 ++-- build/pkgs/setuptools/package-version.txt | 2 +- ...utils-ccompiler.py-CCompiler.has_fun.patch | 29 ------------------- 3 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 build/pkgs/setuptools/patches/0001-setuptools-_distutils-ccompiler.py-CCompiler.has_fun.patch diff --git a/build/pkgs/setuptools/checksums.ini b/build/pkgs/setuptools/checksums.ini index c455cc2a840..a1de878e222 100644 --- a/build/pkgs/setuptools/checksums.ini +++ b/build/pkgs/setuptools/checksums.ini @@ -1,5 +1,5 @@ tarball=setuptools-VERSION.tar.gz -sha1=29004bc6d5a192580f562f4ff24ac164fb722ac5 -md5=04402d15308fb70de2de4a1c537ade1f -cksum=92264041 +sha1=0e2082949ef219fa4080577c9aecb7bbf860dced +md5=3946d41cba415d9609dff6d70e472e6e +cksum=3572111344 upstream_url=https://pypi.io/packages/source/s/setuptools/setuptools-VERSION.tar.gz diff --git a/build/pkgs/setuptools/package-version.txt b/build/pkgs/setuptools/package-version.txt index 15764b0eec8..ae25a0b6ddc 100644 --- a/build/pkgs/setuptools/package-version.txt +++ b/build/pkgs/setuptools/package-version.txt @@ -1 +1 @@ -58.5.3 +59.1.0 diff --git a/build/pkgs/setuptools/patches/0001-setuptools-_distutils-ccompiler.py-CCompiler.has_fun.patch b/build/pkgs/setuptools/patches/0001-setuptools-_distutils-ccompiler.py-CCompiler.has_fun.patch deleted file mode 100644 index da906442195..00000000000 --- a/build/pkgs/setuptools/patches/0001-setuptools-_distutils-ccompiler.py-CCompiler.has_fun.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 423db96cf071ad9e96327e98afac6ace55dd41a5 Mon Sep 17 00:00:00 2001 -From: Matthias Koeppe -Date: Sat, 6 Nov 2021 18:50:14 -0700 -Subject: [PATCH] setuptools/_distutils/ccompiler.py (CCompiler.has_function): - Do not fail if self.outputdir is set - ---- - setuptools/_distutils/ccompiler.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/setuptools/_distutils/ccompiler.py b/setuptools/_distutils/ccompiler.py -index 48d160d2..5697f045 100644 ---- a/setuptools/_distutils/ccompiler.py -+++ b/setuptools/_distutils/ccompiler.py -@@ -802,7 +802,10 @@ int main (int argc, char **argv) { - except (LinkError, TypeError): - return False - else: -- os.remove("a.out") -+ output_dir = self.output_dir -+ if output_dir is None: -+ output_dir = '' -+ os.remove(os.path.join(output_dir, "a.out")) - finally: - for fn in objects: - os.remove(fn) --- -2.33.0 - From b430bcf4c46c4822a0b248db307565dd2c814119 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 18 Nov 2021 21:23:44 -0800 Subject: [PATCH 9/9] build/pkgs/setuptools: Update to 59.2.0 --- build/pkgs/setuptools/checksums.ini | 6 +++--- build/pkgs/setuptools/package-version.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pkgs/setuptools/checksums.ini b/build/pkgs/setuptools/checksums.ini index a1de878e222..d9290d04ffb 100644 --- a/build/pkgs/setuptools/checksums.ini +++ b/build/pkgs/setuptools/checksums.ini @@ -1,5 +1,5 @@ tarball=setuptools-VERSION.tar.gz -sha1=0e2082949ef219fa4080577c9aecb7bbf860dced -md5=3946d41cba415d9609dff6d70e472e6e -cksum=3572111344 +sha1=cd4e5d1f7c47f86354fc89d040d869cde244da3b +md5=79b36f59270a6f2e45d6a9a0c6dc68c1 +cksum=430889097 upstream_url=https://pypi.io/packages/source/s/setuptools/setuptools-VERSION.tar.gz diff --git a/build/pkgs/setuptools/package-version.txt b/build/pkgs/setuptools/package-version.txt index ae25a0b6ddc..aec1257e4c0 100644 --- a/build/pkgs/setuptools/package-version.txt +++ b/build/pkgs/setuptools/package-version.txt @@ -1 +1 @@ -59.1.0 +59.2.0