aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xextra/python/build20
-rw-r--r--extra/python/checksums4
-rw-r--r--extra/python/depends4
-rw-r--r--extra/python/patches/python3-always-pip.patch10
-rw-r--r--extra/python/sources3
-rw-r--r--extra/python/version2
6 files changed, 31 insertions, 12 deletions
diff --git a/extra/python/build b/extra/python/build
index ba2b93bf..50532a5b 100755
--- a/extra/python/build
+++ b/extra/python/build
@@ -1,5 +1,23 @@
#!/bin/sh -e
+# Forgive me father, for I have sinned.
+(
+ cd openssl
+
+ ./Configure \
+ --prefix=/usr \
+ --openssldir=/etc/ssl \
+ --libdir=lib \
+ no-unit-test \
+ no-shared \
+ linux-x86_64
+
+ make depend
+ make
+
+ make DESTDIR=$PWD/pkg install_sw
+)
+
patch -p1 < python3-always-pip.patch
./configure \
@@ -8,6 +26,8 @@ patch -p1 < python3-always-pip.patch
--enable-static \
--with-system-expat \
--with-system-ffi \
+ --with-openssl="$PWD/openssl/pkg/usr" \
+ --with-openssl-rpath=no \
--with-ensurepip=yes
make
diff --git a/extra/python/checksums b/extra/python/checksums
index b1993db6..616ccf7c 100644
--- a/extra/python/checksums
+++ b/extra/python/checksums
@@ -1,3 +1,3 @@
%BLAKE3
-435c8a7d3096833a87e7391022933e114a2c5b464b43830fd3899c2936d1941e Python-3.9.7.tar.xz
-0d586436f7bd8982bb64bba513c754a2fbd8c1eb82df113e8cd30fca62d066c9 python3-always-pip.patch
+37b51e7a1285525e54071df48ba4a3b763480c63fd9f029b39ace0f5eb15ee7f Python-3.10.0.tar.xz
+3d764f2f6c4d40261a96617a6fa23456a7db841a919ed2589d15746b7ef26314 python3-always-pip.patch
diff --git a/extra/python/depends b/extra/python/depends
index b95b8a0d..7ab63869 100644
--- a/extra/python/depends
+++ b/extra/python/depends
@@ -1,6 +1,6 @@
bzip2
expat
-libffi make
-libressl make
+libffi make
+perl make
sqlite
zlib
diff --git a/extra/python/patches/python3-always-pip.patch b/extra/python/patches/python3-always-pip.patch
index a228bd6b..5b0fe7d6 100644
--- a/extra/python/patches/python3-always-pip.patch
+++ b/extra/python/patches/python3-always-pip.patch
@@ -1,9 +1,7 @@
-diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
-index f3152a5..52f6312 100644
---- a/Lib/ensurepip/__init__.py
-+++ b/Lib/ensurepip/__init__.py
-@@ -116,7 +116,7 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
- additional_paths.append(os.path.join(tmpdir, wheel_name))
+--- python/Lib/ensurepip/__init__.py.orig Wed Oct 6 02:23:28 2021
++++ python/Lib/ensurepip/__init__.py Wed Oct 6 02:23:47 2021
+@@ -180,7 +180,7 @@
+ additional_paths.append(filename)
# Construct the arguments to be passed to the pip command
- args = ["install", "--no-cache-dir", "--no-index", "--find-links", tmpdir]
diff --git a/extra/python/sources b/extra/python/sources
index 48d28778..5896de60 100644
--- a/extra/python/sources
+++ b/extra/python/sources
@@ -1,2 +1,3 @@
-https://www.python.org/ftp/python/3.9.7/Python-3.9.7.tar.xz
+https://www.python.org/ftp/python/3.10.0/Python-3.10.0.tar.xz
+https://www.openssl.org/source/openssl-3.0.0.tar.gz openssl
patches/python3-always-pip.patch
diff --git a/extra/python/version b/extra/python/version
index 476235b0..7951492a 100644
--- a/extra/python/version
+++ b/extra/python/version
@@ -1 +1 @@
-3.9.7 2
+3.10.0 1