wok diff python/receipt @ rev 23766

qemu/cloop: tiny fix
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed May 06 19:55:46 2020 +0000 (2020-05-06)
parents 6135577f4d08
children 3e9a9990c985
line diff
     1.1 --- a/python/receipt	Sat Jan 26 12:26:47 2019 +0100
     1.2 +++ b/python/receipt	Wed May 06 19:55:46 2020 +0000
     1.3 @@ -1,31 +1,37 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="python"
     1.7 -VERSION="2.7.15"
     1.8 +VERSION="2.7.17"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="The Python programming language."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12  LICENSE="PSL"
    1.13 +WEB_SITE="https://www.python.org/"
    1.14 +
    1.15  SOURCE="Python"
    1.16  TARBALL="$SOURCE-$VERSION.tar.xz"
    1.17 -WEB_SITE="https://www.python.org/"
    1.18  WGET_URL="https://www.python.org/ftp/python/$VERSION/$TARBALL"
    1.19 +
    1.20 +RELATED="python-dev python-idle" # versions must match
    1.21 +DEPENDS="bzlib gdbm libffi ncursesw openssl readline sqlite zlib"
    1.22 +BUILD_DEPENDS="bzip2-dev db-dev gdbm-dev libffi-dev ncursesw-dev 
    1.23 +	openssl-dev readline-dev sqlite-dev tcl-dev tk-dev zlib-dev"
    1.24 +
    1.25  HOST_ARCH="i486 arm"
    1.26  
    1.27 -RELATED="python-dev python-idle" # version must match
    1.28 -DEPENDS="openssl bzlib readline sqlite zlib ncursesw gdbm libffi"
    1.29 -BUILD_DEPENDS="openssl-dev bzip2-dev readline-dev sqlite-dev zlib-dev \
    1.30 -ncursesw-dev tcl-dev tk-dev db-dev gdbm-dev wget libffi-dev"
    1.31 +# @maintainer: Please update also: python-idle
    1.32  
    1.33  # Rules to configure and make the package.
    1.34  compile_rules()
    1.35  {
    1.36  	# Temporary workaround for FS#22322
    1.37  	# See http://bugs.python.org/issue10835 for upstream report
    1.38 -	sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
    1.39 +	sed -i "/progname =/s/python/python${_pybasever}/" \
    1.40 +		Python/pythonrun.c
    1.41  
    1.42  	# Enable built-in SQLite3 module to load extensions (fix FS#22122)
    1.43 -	sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
    1.44 +	sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" \
    1.45 +		setup.py
    1.46  
    1.47  	case "$ARCH" in
    1.48  		arm*)
    1.49 @@ -36,15 +42,16 @@
    1.50  			cat >> $CONFIG_SITE << EOT
    1.51  ac_cv_have_long_long_format=yes
    1.52  EOT
    1.53 -			./configure CC=gcc \
    1.54 -				--disable-ipv6 \
    1.55 -				--build=i486-slitaz-linux \
    1.56 +			./configure CC=gcc			\
    1.57 +				--disable-ipv6			\
    1.58 +				--build=i486-slitaz-linux	\
    1.59  				--host=${BUILD_SYSTEM} && 
    1.60  			make python Parser/pgen &&
    1.61  			mv python hostpython &&
    1.62  			mv Parser/pgen Parser/hostpgen || exit 1
    1.63  			make distclean
    1.64  			rm -f $CONFIG_SITE
    1.65 +
    1.66  			# Second pass for host tools
    1.67  			. /etc/slitaz/cook.conf
    1.68  			#patch -p1 < $stuff/python-2.7.3-xcompile.patch || exit 1
    1.69 @@ -56,25 +63,27 @@
    1.70  ac_cv_file__dev_ptmx=yes
    1.71  ac_cv_file__dev_ptc=no
    1.72  EOT
    1.73 -			./configure CC=${HOST_SYSTEM}-gcc \
    1.74 -				--disable-ipv6 \
    1.75 -				--enable-shared \
    1.76 -				--with-system-ffi \
    1.77 +
    1.78 +			./configure CC=${HOST_SYSTEM}-gcc	\
    1.79 +				--disable-ipv6			\
    1.80 +				--enable-shared			\
    1.81 +				--with-system-ffi		\
    1.82  				${CONFIGURE_ARGS} &&
    1.83 -			make \
    1.84 -				PYTHON_FOR_BUILD=${src}/hostpython \
    1.85 -				HOSTPYTHON=${src}/hostpython \
    1.86 -				HOSTPGEN=${src}/Parser/hostpgen \
    1.87 -				CROSS_COMPILE_TARGET=yes \
    1.88 -				HOSTARCH=${HOST_SYSTEM} \
    1.89 +			make						\
    1.90 +				PYTHON_FOR_BUILD=${src}/hostpython	\
    1.91 +				HOSTPYTHON=${src}/hostpython		\
    1.92 +				HOSTPGEN=${src}/Parser/hostpgen		\
    1.93 +				CROSS_COMPILE_TARGET=yes		\
    1.94 +				HOSTARCH=${HOST_SYSTEM}			\
    1.95  				BUILDARCH=${BUILD_SYSTEM} || exit 1
    1.96 -			make DESTDIR=$DESTDIR install || exit 1 ;;
    1.97 +			make	DESTDIR=$DESTDIR install || exit 1 ;;
    1.98  		i?86)
    1.99 -			./configure \
   1.100 -				--enable-shared \
   1.101 -				--build=${HOST_SYSTEM} \
   1.102 +			./configure			\
   1.103 +				--enable-shared		\
   1.104 +				--build=${HOST_SYSTEM}	\
   1.105  				--host=${HOST_SYSTEM} &&
   1.106 -				make &&	make DESTDIR=$DESTDIR install ;;
   1.107 +				make &&
   1.108 +				make DESTDIR=$DESTDIR install ;;
   1.109  	esac
   1.110  }
   1.111  
   1.112 @@ -83,13 +92,16 @@
   1.113  {
   1.114  	python_version=${VERSION:0:3}
   1.115  	mkdir -p $fs/usr/include/${PACKAGE}$python_version
   1.116 -	cp -a $install/usr/bin $fs/usr
   1.117 -	cp -a $install/usr/lib $fs/usr
   1.118 +
   1.119 +	cp -a $install/usr/bin	$fs/usr
   1.120 +	cp -a $install/usr/lib	$fs/usr
   1.121 +
   1.122  	# needed for mercurial to work now
   1.123  	cp -a $install/usr/include/${PACKAGE}$python_version/pyconfig.h \
   1.124 -		$fs/usr/include/${PACKAGE}$python_version
   1.125 -	rm -f $fs/usr/bin/*-config
   1.126 +				$fs/usr/include/${PACKAGE}$python_version
   1.127 +	rm -f			$fs/usr/bin/*-config
   1.128 +
   1.129  	# Split IDLE with TK dep
   1.130 -	rm -f $fs/usr/bin/idle
   1.131 -	rm -rf $fs/usr/lib/python2.7/idlelib
   1.132 +	rm -f			$fs/usr/bin/idle
   1.133 +	rm -rf			$fs/usr/lib/python2.7/idlelib
   1.134  }