uwsgi: rebuild for Python 3.5

Switch to python3-* pkgs.
Convert python3.4-* pkg into dummy pkg.
This commit is contained in:
Alessio Sergi 2016-10-17 03:26:25 +02:00
parent 8f6ccc4e67
commit 5b94abafa9
2 changed files with 21 additions and 15 deletions

1
srcpkgs/uwsgi-python3 Symbolic link
View File

@ -0,0 +1 @@
uwsgi

View File

@ -1,9 +1,9 @@
# Template file for 'uwsgi' # Template file for 'uwsgi'
pkgname=uwsgi pkgname=uwsgi
version=2.0.14 version=2.0.14
revision=1 revision=2
hostmakedepends="python python3.4" hostmakedepends="python python3"
makedepends="python-devel python3.4-devel" makedepends="python-devel python3-devel"
short_desc="Fast, self-healing application container server" short_desc="Fast, self-healing application container server"
maintainer="Eivind Uggedal <eivind@uggedal.com>" maintainer="Eivind Uggedal <eivind@uggedal.com>"
license="GPL-2" license="GPL-2"
@ -13,7 +13,7 @@ checksum=21b3d1ef926d835ff23576193a2c60d4c896d8e21567850cf0677a4764122887
_libdir=usr/lib/uwsgi _libdir=usr/lib/uwsgi
subpackages="uwsgi-python uwsgi-python3.4" subpackages="uwsgi-python uwsgi-python3 uwsgi-python3.4"
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
armv[67]l-musl) subpackages="uwsgi-python" armv[67]l-musl) subpackages="uwsgi-python"
esac esac
@ -29,26 +29,26 @@ do_build() {
local _cflags="$CFLAGS" local _cflags="$CFLAGS"
local _ldflags="$LDFLAGS" local _ldflags="$LDFLAGS"
python uwsgiconfig.py --build core python2 uwsgiconfig.py --build core
if [ -n "$CROSS_BUILD" ]; then if [ -n "$CROSS_BUILD" ]; then
_cflags="$CFLAGS -I${XBPS_CROSS_BASE}/include/python2.7 _cflags="$CFLAGS -I${XBPS_CROSS_BASE}/${py2_inc}
-I${XBPS_CROSS_BASE}/usr/include" -I${XBPS_CROSS_BASE}/usr/include"
_ldflags="$LDFLAGS -L${XBPS_CROSS_BASE}/lib/python2.7 _ldflags="$LDFLAGS -L${XBPS_CROSS_BASE}/${py2_lib}
-L${XBPS_CROSS_BASE}/usr/lib" -L${XBPS_CROSS_BASE}/usr/lib"
fi fi
CFLAGS="$_cflags" LDFLAGS="$_ldflags" python uwsgiconfig.py \ CFLAGS="$_cflags" LDFLAGS="$_ldflags" python2 uwsgiconfig.py \
--plugin plugins/python core python --plugin plugins/python core python
if [ -n "$CROSS_BUILD" ]; then if [ -n "$CROSS_BUILD" ]; then
_cflags="$CFLAGS -I${XBPS_CROSS_BASE}/include/python3.4m _cflags="$CFLAGS -I${XBPS_CROSS_BASE}/${py3_inc}
-I${XBPS_CROSS_BASE}/usr/include" -I${XBPS_CROSS_BASE}/usr/include"
_ldflags="$LDFLAGS -L${XBPS_CROSS_BASE}/lib/python3.4m _ldflags="$LDFLAGS -L${XBPS_CROSS_BASE}/${py3_lib}
-L${XBPS_CROSS_BASE}/usr/lib" -L${XBPS_CROSS_BASE}/usr/lib"
fi fi
case "$subpackages" in case "$subpackages" in
*uwsgi-python3.4*) *uwsgi-python3*)
CFLAGS="$_cflags" LDFLAGS="$_ldflags" python3.4 uwsgiconfig.py \ CFLAGS="$_cflags" LDFLAGS="$_ldflags" python3 uwsgiconfig.py \
--plugin plugins/python core python3 --plugin plugins/python core python3
;; ;;
esac esac
@ -66,10 +66,15 @@ uwsgi-python_package() {
vmove $_libdir/python_plugin.so vmove $_libdir/python_plugin.so
} }
} }
uwsgi-python3_package() {
uwsgi-python3.4_package() { replaces="uwsgi-python3.4>=0"
short_desc="$short_desc (Python3.4 plugin)" short_desc="$short_desc (Python3 plugin)"
pkg_install() { pkg_install() {
vmove $_libdir/python3_plugin.so vmove $_libdir/python3_plugin.so
} }
} }
uwsgi-python3.4_package() {
build_style=meta
short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)"
depends="uwsgi-python3>=${version}_${revision}"
}