# HG changeset patch # User Hans-G?nter Theisgen # Date 1586350149 -3600 # Node ID 0e3b43ca38e6cf7f54ab96f3b0c66ceb95291af7 # Parent b39f96775170c908ae8fa99ecc8f9cc4a219e775 updated python, python-dev and python-idle (2.7.15 -> 2.7.17) diff -r b39f96775170 -r 0e3b43ca38e6 python-dev/receipt --- a/python-dev/receipt Wed Apr 08 11:15:24 2020 +0100 +++ b/python-dev/receipt Wed Apr 08 13:49:09 2020 +0100 @@ -1,27 +1,29 @@ # SliTaz package receipt. PACKAGE="python-dev" -VERSION="2.7.15" +VERSION="2.7.17" CATEGORY="development" -SHORT_DESC="The Python programming language devel files." +SHORT_DESC="The Python programming language - development files." MAINTAINER="pankso@slitaz.org" LICENSE="PSL" +WEB_SITE="https://www.python.org/" + +SOURCE="Python" +DEPENDS="python" WANTED="python" -SOURCE="Python" -WEB_SITE="https://www.python.org/" + HOST_ARCH="i486 arm" -DEPENDS="python" - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/bin - cp -a $install/usr/include $fs/usr - cp -a $install/usr/bin/*-config $fs/usr/bin - chmod 755 $fs/usr/bin/*-config + + cp -a $install/usr/include $fs/usr + cp -a $install/usr/bin/*-config $fs/usr/bin + chmod 755 $fs/usr/bin/*-config + # in python package now python_version=${VERSION:0:3} - rm $fs/usr/include/${WANTED}$python_version/pyconfig.h + rm $fs/usr/include/${WANTED}$python_version/pyconfig.h } - diff -r b39f96775170 -r 0e3b43ca38e6 python-idle/receipt --- a/python-idle/receipt Wed Apr 08 11:15:24 2020 +0100 +++ b/python-idle/receipt Wed Apr 08 13:49:09 2020 +0100 @@ -1,22 +1,24 @@ # SliTaz package receipt. PACKAGE="python-idle" -VERSION="2.7.15" +VERSION="2.7.17" CATEGORY="development" -SHORT_DESC="Python GUI IDE using TK Toolkit" +SHORT_DESC="Python GUI IDE using TK Toolkit." MAINTAINER="pankso@slitaz.org" LICENSE="PSL" WEB_SITE="https://www.python.org/" + +DEPENDS="python tcl tk" +WANTED="python" + HOST_ARCH="i486 arm" -WANTED="python" -DEPENDS="python tcl tk" - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/bin $fs/usr/lib/python2.7 - cp -a $install/usr/bin/idle $fs/usr/bin - cp -a $install/usr/lib/python2.7/idlelib $fs/usr/lib/python2.7 + mkdir -p $fs/usr/bin + mkdir -p $fs/usr/lib/python2.7 + + cp -a $install/usr/bin/idle $fs/usr/bin + cp -a $install/usr/lib/python2.7/idlelib $fs/usr/lib/python2.7 } - diff -r b39f96775170 -r 0e3b43ca38e6 python/receipt --- a/python/receipt Wed Apr 08 11:15:24 2020 +0100 +++ b/python/receipt Wed Apr 08 13:49:09 2020 +0100 @@ -1,31 +1,37 @@ # SliTaz package receipt. PACKAGE="python" -VERSION="2.7.15" +VERSION="2.7.17" CATEGORY="development" SHORT_DESC="The Python programming language." MAINTAINER="pankso@slitaz.org" LICENSE="PSL" +WEB_SITE="https://www.python.org/" + SOURCE="Python" TARBALL="$SOURCE-$VERSION.tar.xz" -WEB_SITE="https://www.python.org/" WGET_URL="https://www.python.org/ftp/python/$VERSION/$TARBALL" + +RELATED="python-dev python-idle" # versions must match +DEPENDS="bzlib gdbm libffi ncursesw openssl readline sqlite zlib" +BUILD_DEPENDS="bzip2-dev db-dev gdbm-dev libffi-dev ncursesw-dev + openssl-dev readline-dev sqlite-dev tcl-dev tk-dev zlib-dev" + HOST_ARCH="i486 arm" -RELATED="python-dev python-idle" # version must match -DEPENDS="openssl bzlib readline sqlite zlib ncursesw gdbm libffi" -BUILD_DEPENDS="openssl-dev bzip2-dev readline-dev sqlite-dev zlib-dev \ -ncursesw-dev tcl-dev tk-dev db-dev gdbm-dev wget libffi-dev" +# @maintainer: Please update also: python-idle # Rules to configure and make the package. compile_rules() { # Temporary workaround for FS#22322 # See http://bugs.python.org/issue10835 for upstream report - sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c + sed -i "/progname =/s/python/python${_pybasever}/" \ + Python/pythonrun.c # Enable built-in SQLite3 module to load extensions (fix FS#22122) - sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py + sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" \ + setup.py case "$ARCH" in arm*) @@ -36,15 +42,16 @@ cat >> $CONFIG_SITE << EOT ac_cv_have_long_long_format=yes EOT - ./configure CC=gcc \ - --disable-ipv6 \ - --build=i486-slitaz-linux \ + ./configure CC=gcc \ + --disable-ipv6 \ + --build=i486-slitaz-linux \ --host=${BUILD_SYSTEM} && make python Parser/pgen && mv python hostpython && mv Parser/pgen Parser/hostpgen || exit 1 make distclean rm -f $CONFIG_SITE + # Second pass for host tools . /etc/slitaz/cook.conf #patch -p1 < $stuff/python-2.7.3-xcompile.patch || exit 1 @@ -56,25 +63,27 @@ ac_cv_file__dev_ptmx=yes ac_cv_file__dev_ptc=no EOT - ./configure CC=${HOST_SYSTEM}-gcc \ - --disable-ipv6 \ - --enable-shared \ - --with-system-ffi \ + + ./configure CC=${HOST_SYSTEM}-gcc \ + --disable-ipv6 \ + --enable-shared \ + --with-system-ffi \ ${CONFIGURE_ARGS} && - make \ - PYTHON_FOR_BUILD=${src}/hostpython \ - HOSTPYTHON=${src}/hostpython \ - HOSTPGEN=${src}/Parser/hostpgen \ - CROSS_COMPILE_TARGET=yes \ - HOSTARCH=${HOST_SYSTEM} \ + make \ + PYTHON_FOR_BUILD=${src}/hostpython \ + HOSTPYTHON=${src}/hostpython \ + HOSTPGEN=${src}/Parser/hostpgen \ + CROSS_COMPILE_TARGET=yes \ + HOSTARCH=${HOST_SYSTEM} \ BUILDARCH=${BUILD_SYSTEM} || exit 1 - make DESTDIR=$DESTDIR install || exit 1 ;; + make DESTDIR=$DESTDIR install || exit 1 ;; i?86) - ./configure \ - --enable-shared \ - --build=${HOST_SYSTEM} \ + ./configure \ + --enable-shared \ + --build=${HOST_SYSTEM} \ --host=${HOST_SYSTEM} && - make && make DESTDIR=$DESTDIR install ;; + make && + make DESTDIR=$DESTDIR install ;; esac } @@ -83,13 +92,16 @@ { python_version=${VERSION:0:3} mkdir -p $fs/usr/include/${PACKAGE}$python_version - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/lib $fs/usr + + cp -a $install/usr/bin $fs/usr + cp -a $install/usr/lib $fs/usr + # needed for mercurial to work now cp -a $install/usr/include/${PACKAGE}$python_version/pyconfig.h \ - $fs/usr/include/${PACKAGE}$python_version - rm -f $fs/usr/bin/*-config + $fs/usr/include/${PACKAGE}$python_version + rm -f $fs/usr/bin/*-config + # Split IDLE with TK dep - rm -f $fs/usr/bin/idle - rm -rf $fs/usr/lib/python2.7/idlelib + rm -f $fs/usr/bin/idle + rm -rf $fs/usr/lib/python2.7/idlelib }