aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew J. Hesford <ajh@sideband.org>2021-09-25 01:58:45 +0000
committerAndrew J. Hesford <ajh@sideband.org>2021-10-09 12:00:19 +0000
commit9b61ec59f99501b9d6b4db00ae7e1df79383fd83 (patch)
tree157620b0404509e0e247b8ce98e93caa783d52d0
parente7ca6798247fb7a2d6373dbc48697041df4ebd67 (diff)
downloadvoid-packages-9b61ec59f99501b9d6b4db00ae7e1df79383fd83.tar
void-packages-9b61ec59f99501b9d6b4db00ae7e1df79383fd83.tar.gz
void-packages-9b61ec59f99501b9d6b4db00ae7e1df79383fd83.tar.bz2
void-packages-9b61ec59f99501b9d6b4db00ae7e1df79383fd83.tar.lz
void-packages-9b61ec59f99501b9d6b4db00ae7e1df79383fd83.tar.xz
void-packages-9b61ec59f99501b9d6b4db00ae7e1df79383fd83.tar.zst
void-packages-9b61ec59f99501b9d6b4db00ae7e1df79383fd83.zip
python3: update to 3.10.0.
-rw-r--r--common/environment/setup/python.sh2
-rw-r--r--common/hooks/post-install/04-create-xbps-metadata-scripts.sh2
-rw-r--r--common/hooks/pre-configure/02-script-wrapper.sh2
-rw-r--r--common/hooks/pre-pkg/03-rewrite-python-shebang.sh2
-rw-r--r--common/shlibs2
-rw-r--r--srcpkgs/python3/template42
6 files changed, 24 insertions, 28 deletions
diff --git a/common/environment/setup/python.sh b/common/environment/setup/python.sh
index 993cf3587a1..43ee4d08a54 100644
--- a/common/environment/setup/python.sh
+++ b/common/environment/setup/python.sh
@@ -7,7 +7,7 @@ py2_lib="usr/lib/python${py2_ver}"
py2_sitelib="${py2_lib}/site-packages"
py2_inc="usr/include/python${py2_ver}"
-py3_ver="3.9"
+py3_ver="3.10"
py3_abiver=""
py3_lib="usr/lib/python${py3_ver}"
py3_sitelib="${py3_lib}/site-packages"
diff --git a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
index 8bb86c4487a..69e318a5608 100644
--- a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
+++ b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
@@ -266,7 +266,7 @@ _EOF
#
local pycompile_version
if [ -d ${PKGDESTDIR}/usr/lib/python* ]; then
- pycompile_version="$(find ${PKGDESTDIR}/usr/lib/python* -prune -type d | grep -o '[[:digit:]]\.[[:digit:]]$')"
+ pycompile_version="$(find ${PKGDESTDIR}/usr/lib/python* -prune -type d | grep -o '[[:digit:]]\.[[:digit:]]\+$')"
if [ -z "${pycompile_module}" ]; then
pycompile_module="$(find ${PKGDESTDIR}/usr/lib/python*/site-packages -mindepth 1 -maxdepth 1 '!' -name '*.egg-info' '!' -name '*.dist-info' '!' -name '*.so' '!' -name '*.pth' -printf '%f ')"
fi
diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index 1cbd9df6363..09c796001ea 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -236,7 +236,7 @@ hook() {
generic_wrapper3 libetpan-config
generic_wrapper3 giblib-config
python_wrapper python-config 2.7
- python_wrapper python3-config 3.9
+ python_wrapper python3-config 3.10
apr_apu_wrapper apr-1-config
apr_apu_wrapper apu-1-config
}
diff --git a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
index 60e7f61975b..07162ad2c69 100644
--- a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
+++ b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
@@ -5,7 +5,7 @@ hook() {
local pyver= shebang= off=
if [ -d ${PKGDESTDIR}/usr/lib/python* ]; then
- pyver="$(find ${PKGDESTDIR}/usr/lib/python* -prune -type d | grep -o '[[:digit:]]\.[[:digit:]]$')"
+ pyver="$(find ${PKGDESTDIR}/usr/lib/python* -prune -type d | grep -o '[[:digit:]]\.[[:digit:]]\+$')"
fi
if [ -n "$python_version" ]; then
diff --git a/common/shlibs b/common/shlibs
index 7e5289f58f6..4e7b70f6b16 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1718,7 +1718,7 @@ libportaudiocpp.so.0 portaudio-cpp-19.20140130_1
libdar.so.6000 libdar-2.6.6_1
libdar64.so.6000 libdar-2.6.6_1
libpython3.so python3-3.9.2_2
-libpython3.9.so.1.0 python3-3.9.2_2
+libpython3.10.so.1.0 python3-3.10.0_1
libbrscandec2.so.1 brother-brscan3-0.2.11_2
libpyglib-2.0-python.so.0 python-gobject2-2.28.6_11
libxmlrpc_server_abyss.so.3 xmlrpc-c-1.51.06_2
diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 93a0fc82527..cdaf9bd2e3d 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -3,9 +3,14 @@
# THIS PACKAGE MUST BE SYNCHRONIZED WITH "srcpkgs/python3-tkinter".
#
pkgname=python3
-version=3.9.7
+version=3.10.0
revision=1
wrksrc="Python-${version}"
+build_style="gnu-configure"
+configure_args="--enable-shared --enable-ipv6
+ --enable-loadable-sqlite-extensions --with-computed-gotos
+ --with-dbmliborder=gdbm:ndbm --with-system-expat --with-system-ffi
+ --without-ensurepip ac_cv_working_tzset=yes"
pycompile_dirs="usr/lib/python${version%.*}"
hostmakedepends="pkgconf"
makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
@@ -17,7 +22,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="Python-2.0"
homepage="https://www.python.org"
distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=f8145616e68c00041d1a6399b76387390388f8359581abc24432bb969b5e3c57
+checksum=5a99f8e7a6a11a7b98b4e75e0d1303d3832cada5534068f69c7b6222a7b1b002
alternatives="
python:idle:/usr/bin/idle${version%.*}
@@ -26,36 +31,28 @@ alternatives="
python:python:/usr/bin/python${version%.*}
python:python.1:/usr/share/man/man1/python${version%.*}.1"
-pre_configure() {
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" python3"
+fi
+
+post_extract() {
# Ensure that internal copies of expat and libffi are not used
rm -rf Modules/expat
rm -rf Modules/_ctypes/{darwin,libffi}*
}
-do_configure() {
- local _args
- unset GCC CC CXX CPP LD AR AS RANLIB
+post_patch() {
if [ "$CROSS_BUILD" ]; then
- mkdir -p host-build
- cd host-build
- env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH CFLAGS=-Os ../configure
- env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
- mkdir -p ../hostpython
- mv python ../hostpython
- cd ..
patch -Np0 -i ${FILESDIR}/cross.patch
- _args="--build=${XBPS_MACHINE%%-musl}"
fi
- ./configure ${configure_args} ${_args} \
- --enable-shared --enable-ipv6 --enable-loadable-sqlite-extensions \
- --with-computed-gotos --with-dbmliborder=gdbm:ndbm \
- --with-system-expat --with-system-ffi --without-ensurepip \
- ac_cv_working_tzset=yes
}
-do_build() {
- export PATH="$PATH:$wrksrc/hostpython"
- make ${makejobs}
+do_configure() {
+ # If these are set, distutils will default to cc and attempt to pass
+ # `-R<path>` to the compiler for every compiled extension that sets an
+ # rpath rather than the '-Wl,-R<path>' argument that GCC requires
+ unset GCC CC CXX CPP LD AR AS RANLIB
+ ./configure ${configure_args}
}
do_check() {
@@ -77,7 +74,6 @@ do_check() {
}
do_install() {
- export PATH="$PATH:$wrksrc/hostpython"
make DESTDIR=${DESTDIR} install maninstall
vlicense LICENSE