diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template index b631f5b6b7..2aa3be1efb 100644 --- a/srcpkgs/python3-tkinter/template +++ b/srcpkgs/python3-tkinter/template @@ -8,9 +8,14 @@ _desc="Python programming language" pkgname=python3-tkinter -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" pycompile_dirs=" usr/lib/python${version%.*}/tkinter usr/lib/python${version%.*}/turtledemo @@ -23,37 +28,27 @@ maintainer="Andrew J. Hesford " homepage="https://www.python.org" license="Python-2.0" distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz" -checksum=f8145616e68c00041d1a6399b76387390388f8359581abc24432bb969b5e3c57 +checksum=5a99f8e7a6a11a7b98b4e75e0d1303d3832cada5534068f69c7b6222a7b1b002 -pre_configure() { +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" python3" +fi + +post_extract() { # Ensure that internal copies of expat and libffi are not used. rm -r Modules/expat rm -r 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 } -do_build() { - export PATH="$PATH:$wrksrc/hostpython" - make ${makejobs} +do_configure() { + unset GCC CC CXX CPP LD AR AS RANLIB + ./configure ${configure_args} } do_check() { @@ -62,8 +57,6 @@ do_check() { } do_install() { - export PATH="$PATH:$wrksrc/hostpython" - mkdir -p ${wrksrc}/tmp-destdir/usr/lib ln -s lib ${wrksrc}/tmp-destdir/usr/lib${XBPS_TARGET_WORDSIZE}