moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

uwsgi: update to 2.0.19.1.

Browse source 
* remove uwsgi-python (python2 plugin)
* add cgi plugin as a uwsgi-cgi subpackage
* clarify the license
* simplify the template
This commit is contained in:
Michal Vasilek 2021-06-13 18:51:55 +02:00 • committed by Érico Nogueira Rolim
parent 8f00a4e79c
commit e4c0d72294
3 changed files with 24 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

1
srcpkgs/removed-packages/template
View file

@ -292,6 +292,7 @@ replaces="
ttyload-git<=20141117_4 ttyload-git<=20141117_4
tuxc<=1.1_3 tuxc<=1.1_3
urlmatch-git<=20141116_2 urlmatch-git<=20141116_2
uwsgi-python<=2.0.18_3
v8<=3.24.35.33_4 v8<=3.24.35.33_4
volnoti<=0.1_1 volnoti<=0.1_1
vte<=0.28.2_16 vte<=0.28.2_16

0
srcpkgs/uwsgi-python → srcpkgs/uwsgi-cgi
View file

65
srcpkgs/uwsgi/template
View file

@ -1,45 +1,28 @@
# Template file for 'uwsgi' # Template file for 'uwsgi'
pkgname=uwsgi pkgname=uwsgi
version=2.0.18 version=2.0.19.1
revision=3 revision=1
hostmakedepends="python python3" hostmakedepends="python3"
makedepends="python-devel python3-devel" makedepends="python3-devel"
short_desc="Fast, self-healing application container server" short_desc="Fast, self-healing application container server"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later" license="GPL-2.0-linking-exception"
homepage="http://projects.unbit.it/uwsgi" homepage="http://projects.unbit.it/uwsgi"
distfiles="https://github.com/unbit/uwsgi/archive/${version}.tar.gz" distfiles="https://github.com/unbit/uwsgi/archive/${version}.tar.gz"
checksum=4972ac538800fb2d421027f49b4a1869b66048839507ccf0aa2fda792d99f583 checksum=bf17cdbb9bd8bcb7c1633e34d9d7308cb4cc19eb0ff2d61057f840c1ba1fc41b
_libdir=usr/lib/uwsgi _libdir=usr/lib/uwsgi
subpackages="uwsgi-python uwsgi-python3"
case "$XBPS_TARGET_MACHINE" in
armv[67]l-musl) subpackages="uwsgi-python" ;;
aarch64-musl) makedepends+=" gettext-devel" ;;
esac
pre_configure() { pre_configure() {
sed -e "s|uc.get('plugin_dir')|'.'|" \ vsed -i uwsgiconfig.py -e "s|uc.get('plugin_dir')|'.'|"
-i uwsgiconfig.py vsed -i buildconf/base.ini -e "s|\(plugin_dir =\).*|\1 /$_libdir|"
sed -e "s|\(plugin_dir =\).*|\1 /$_libdir|" \
-i buildconf/base.ini
} }
do_build() { do_build() {
local _cflags="$CFLAGS" local _cflags="$CFLAGS"
local _ldflags="$LDFLAGS" local _ldflags="$LDFLAGS"
python2 uwsgiconfig.py --build core python3 uwsgiconfig.py --build core
if [ "$CROSS_BUILD" ]; then
_cflags="$CFLAGS -I${XBPS_CROSS_BASE}/${py2_inc}
-I${XBPS_CROSS_BASE}/usr/include"
_ldflags="$LDFLAGS -L${XBPS_CROSS_BASE}/${py2_lib}
-L${XBPS_CROSS_BASE}/usr/lib"
fi
CFLAGS="$_cflags" LDFLAGS="$_ldflags" python2 uwsgiconfig.py \
--plugin plugins/python core python
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
_cflags="$CFLAGS -I${XBPS_CROSS_BASE}/${py3_inc} _cflags="$CFLAGS -I${XBPS_CROSS_BASE}/${py3_inc}
@ -47,29 +30,27 @@ do_build() {
_ldflags="$LDFLAGS -L${XBPS_CROSS_BASE}/${py3_lib} _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
*uwsgi-python3*) CFLAGS="$_cflags" LDFLAGS="$_ldflags" python3 uwsgiconfig.py \
CFLAGS="$_cflags" LDFLAGS="$_ldflags" python3 uwsgiconfig.py \ --plugin plugins/python core python3
--plugin plugins/python core python3 CFLAGS="$_cflags" LDFLAGS="$_ldflags" python3 uwsgiconfig.py \
;; --plugin plugins/cgi core cgi
esac
} }
do_install() { do_install() {
mkdir -p $PKGDESTDIR/usr/bin $PKGDESTDIR/$_libdir vbin uwsgi
cp uwsgi $PKGDESTDIR/usr/bin
cp *_plugin.so $PKGDESTDIR/$_libdir
} }
uwsgi-python_package() {
short_desc="$short_desc (Python2 plugin)"
pkg_install() {
vmove $_libdir/python_plugin.so
}
}
uwsgi-python3_package() { uwsgi-python3_package() {
short_desc="$short_desc (Python3 plugin)" short_desc="$short_desc (Python3 plugin)"
pkg_install() { pkg_install() {
vmove $_libdir/python3_plugin.so vcopy python3_plugin.so $_libdir
}
}
uwsgi-cgi_package() {
short_desc="$short_desc (CGI plugin)"
pkg_install() {
vcopy cgi_plugin.so $_libdir
} }
} }