python3: update to 3.10.0.
This commit is contained in:
Andrew J. Hesford
parent
e7ca679824
commit
9b61ec59f9
6 changed files with 24 additions and 28 deletions
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue