wok rev 23594

updated python, python-dev and python-idle (2.7.15 -> 2.7.17)
author Hans-G?nter Theisgen
date Wed Apr 08 13:49:09 2020 +0100 (2020-04-08)
parents b39f96775170
children bb0e17871344
files python-dev/receipt python-idle/receipt python/receipt
line diff
     1.1 --- a/python-dev/receipt	Wed Apr 08 11:15:24 2020 +0100
     1.2 +++ b/python-dev/receipt	Wed Apr 08 13:49:09 2020 +0100
     1.3 @@ -1,27 +1,29 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="python-dev"
     1.7 -VERSION="2.7.15"
     1.8 +VERSION="2.7.17"
     1.9  CATEGORY="development"
    1.10 -SHORT_DESC="The Python programming language devel files."
    1.11 +SHORT_DESC="The Python programming language - development files."
    1.12  MAINTAINER="pankso@slitaz.org"
    1.13  LICENSE="PSL"
    1.14 +WEB_SITE="https://www.python.org/"
    1.15 +
    1.16 +SOURCE="Python"
    1.17 +DEPENDS="python"
    1.18  WANTED="python"
    1.19 -SOURCE="Python"
    1.20 -WEB_SITE="https://www.python.org/"
    1.21 +
    1.22  HOST_ARCH="i486 arm"
    1.23  
    1.24 -DEPENDS="python"
    1.25 -
    1.26  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.27  genpkg_rules()
    1.28  {
    1.29  	mkdir -p $fs/usr/bin
    1.30 -	cp -a $install/usr/include $fs/usr
    1.31 -	cp -a $install/usr/bin/*-config $fs/usr/bin
    1.32 -	chmod 755 $fs/usr/bin/*-config
    1.33 +
    1.34 +	cp -a $install/usr/include	$fs/usr
    1.35 +	cp -a $install/usr/bin/*-config	$fs/usr/bin
    1.36 +	chmod 755			$fs/usr/bin/*-config
    1.37 +
    1.38  	# in python package now
    1.39  	python_version=${VERSION:0:3}
    1.40 -	rm $fs/usr/include/${WANTED}$python_version/pyconfig.h
    1.41 +	rm	$fs/usr/include/${WANTED}$python_version/pyconfig.h
    1.42  }
    1.43 -
     2.1 --- a/python-idle/receipt	Wed Apr 08 11:15:24 2020 +0100
     2.2 +++ b/python-idle/receipt	Wed Apr 08 13:49:09 2020 +0100
     2.3 @@ -1,22 +1,24 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="python-idle"
     2.7 -VERSION="2.7.15"
     2.8 +VERSION="2.7.17"
     2.9  CATEGORY="development"
    2.10 -SHORT_DESC="Python GUI IDE using TK Toolkit"
    2.11 +SHORT_DESC="Python GUI IDE using TK Toolkit."
    2.12  MAINTAINER="pankso@slitaz.org"
    2.13  LICENSE="PSL"
    2.14  WEB_SITE="https://www.python.org/"
    2.15 +
    2.16 +DEPENDS="python tcl tk"
    2.17 +WANTED="python"
    2.18 +
    2.19  HOST_ARCH="i486 arm"
    2.20  
    2.21 -WANTED="python"
    2.22 -DEPENDS="python tcl tk"
    2.23 -
    2.24  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.25  genpkg_rules()
    2.26  {
    2.27 -	mkdir -p $fs/usr/bin $fs/usr/lib/python2.7
    2.28 -	cp -a $install/usr/bin/idle $fs/usr/bin
    2.29 -	cp -a $install/usr/lib/python2.7/idlelib $fs/usr/lib/python2.7
    2.30 +	mkdir -p $fs/usr/bin
    2.31 +	mkdir -p $fs/usr/lib/python2.7
    2.32 +
    2.33 +	cp -a $install/usr/bin/idle			$fs/usr/bin
    2.34 +	cp -a $install/usr/lib/python2.7/idlelib	$fs/usr/lib/python2.7
    2.35  }
    2.36 -
     3.1 --- a/python/receipt	Wed Apr 08 11:15:24 2020 +0100
     3.2 +++ b/python/receipt	Wed Apr 08 13:49:09 2020 +0100
     3.3 @@ -1,31 +1,37 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="python"
     3.7 -VERSION="2.7.15"
     3.8 +VERSION="2.7.17"
     3.9  CATEGORY="development"
    3.10  SHORT_DESC="The Python programming language."
    3.11  MAINTAINER="pankso@slitaz.org"
    3.12  LICENSE="PSL"
    3.13 +WEB_SITE="https://www.python.org/"
    3.14 +
    3.15  SOURCE="Python"
    3.16  TARBALL="$SOURCE-$VERSION.tar.xz"
    3.17 -WEB_SITE="https://www.python.org/"
    3.18  WGET_URL="https://www.python.org/ftp/python/$VERSION/$TARBALL"
    3.19 +
    3.20 +RELATED="python-dev python-idle" # versions must match
    3.21 +DEPENDS="bzlib gdbm libffi ncursesw openssl readline sqlite zlib"
    3.22 +BUILD_DEPENDS="bzip2-dev db-dev gdbm-dev libffi-dev ncursesw-dev 
    3.23 +	openssl-dev readline-dev sqlite-dev tcl-dev tk-dev zlib-dev"
    3.24 +
    3.25  HOST_ARCH="i486 arm"
    3.26  
    3.27 -RELATED="python-dev python-idle" # version must match
    3.28 -DEPENDS="openssl bzlib readline sqlite zlib ncursesw gdbm libffi"
    3.29 -BUILD_DEPENDS="openssl-dev bzip2-dev readline-dev sqlite-dev zlib-dev \
    3.30 -ncursesw-dev tcl-dev tk-dev db-dev gdbm-dev wget libffi-dev"
    3.31 +# @maintainer: Please update also: python-idle
    3.32  
    3.33  # Rules to configure and make the package.
    3.34  compile_rules()
    3.35  {
    3.36  	# Temporary workaround for FS#22322
    3.37  	# See http://bugs.python.org/issue10835 for upstream report
    3.38 -	sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
    3.39 +	sed -i "/progname =/s/python/python${_pybasever}/" \
    3.40 +		Python/pythonrun.c
    3.41  
    3.42  	# Enable built-in SQLite3 module to load extensions (fix FS#22122)
    3.43 -	sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
    3.44 +	sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" \
    3.45 +		setup.py
    3.46  
    3.47  	case "$ARCH" in
    3.48  		arm*)
    3.49 @@ -36,15 +42,16 @@
    3.50  			cat >> $CONFIG_SITE << EOT
    3.51  ac_cv_have_long_long_format=yes
    3.52  EOT
    3.53 -			./configure CC=gcc \
    3.54 -				--disable-ipv6 \
    3.55 -				--build=i486-slitaz-linux \
    3.56 +			./configure CC=gcc			\
    3.57 +				--disable-ipv6			\
    3.58 +				--build=i486-slitaz-linux	\
    3.59  				--host=${BUILD_SYSTEM} && 
    3.60  			make python Parser/pgen &&
    3.61  			mv python hostpython &&
    3.62  			mv Parser/pgen Parser/hostpgen || exit 1
    3.63  			make distclean
    3.64  			rm -f $CONFIG_SITE
    3.65 +
    3.66  			# Second pass for host tools
    3.67  			. /etc/slitaz/cook.conf
    3.68  			#patch -p1 < $stuff/python-2.7.3-xcompile.patch || exit 1
    3.69 @@ -56,25 +63,27 @@
    3.70  ac_cv_file__dev_ptmx=yes
    3.71  ac_cv_file__dev_ptc=no
    3.72  EOT
    3.73 -			./configure CC=${HOST_SYSTEM}-gcc \
    3.74 -				--disable-ipv6 \
    3.75 -				--enable-shared \
    3.76 -				--with-system-ffi \
    3.77 +
    3.78 +			./configure CC=${HOST_SYSTEM}-gcc	\
    3.79 +				--disable-ipv6			\
    3.80 +				--enable-shared			\
    3.81 +				--with-system-ffi		\
    3.82  				${CONFIGURE_ARGS} &&
    3.83 -			make \
    3.84 -				PYTHON_FOR_BUILD=${src}/hostpython \
    3.85 -				HOSTPYTHON=${src}/hostpython \
    3.86 -				HOSTPGEN=${src}/Parser/hostpgen \
    3.87 -				CROSS_COMPILE_TARGET=yes \
    3.88 -				HOSTARCH=${HOST_SYSTEM} \
    3.89 +			make						\
    3.90 +				PYTHON_FOR_BUILD=${src}/hostpython	\
    3.91 +				HOSTPYTHON=${src}/hostpython		\
    3.92 +				HOSTPGEN=${src}/Parser/hostpgen		\
    3.93 +				CROSS_COMPILE_TARGET=yes		\
    3.94 +				HOSTARCH=${HOST_SYSTEM}			\
    3.95  				BUILDARCH=${BUILD_SYSTEM} || exit 1
    3.96 -			make DESTDIR=$DESTDIR install || exit 1 ;;
    3.97 +			make	DESTDIR=$DESTDIR install || exit 1 ;;
    3.98  		i?86)
    3.99 -			./configure \
   3.100 -				--enable-shared \
   3.101 -				--build=${HOST_SYSTEM} \
   3.102 +			./configure			\
   3.103 +				--enable-shared		\
   3.104 +				--build=${HOST_SYSTEM}	\
   3.105  				--host=${HOST_SYSTEM} &&
   3.106 -				make &&	make DESTDIR=$DESTDIR install ;;
   3.107 +				make &&
   3.108 +				make DESTDIR=$DESTDIR install ;;
   3.109  	esac
   3.110  }
   3.111  
   3.112 @@ -83,13 +92,16 @@
   3.113  {
   3.114  	python_version=${VERSION:0:3}
   3.115  	mkdir -p $fs/usr/include/${PACKAGE}$python_version
   3.116 -	cp -a $install/usr/bin $fs/usr
   3.117 -	cp -a $install/usr/lib $fs/usr
   3.118 +
   3.119 +	cp -a $install/usr/bin	$fs/usr
   3.120 +	cp -a $install/usr/lib	$fs/usr
   3.121 +
   3.122  	# needed for mercurial to work now
   3.123  	cp -a $install/usr/include/${PACKAGE}$python_version/pyconfig.h \
   3.124 -		$fs/usr/include/${PACKAGE}$python_version
   3.125 -	rm -f $fs/usr/bin/*-config
   3.126 +				$fs/usr/include/${PACKAGE}$python_version
   3.127 +	rm -f			$fs/usr/bin/*-config
   3.128 +
   3.129  	# Split IDLE with TK dep
   3.130 -	rm -f $fs/usr/bin/idle
   3.131 -	rm -rf $fs/usr/lib/python2.7/idlelib
   3.132 +	rm -f			$fs/usr/bin/idle
   3.133 +	rm -rf			$fs/usr/lib/python2.7/idlelib
   3.134  }