Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

uwsgi: bump version and use less workarounds

Browse source 
* adopt pypi name and line numbers in patches
* remove custom tar command and patch for using python3 (changed upstream)

Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
This commit is contained in:
Peter Stadler 2021-10-28 10:36:00 +02:00 committed by Rosen Penev
parent ab540e6990
commit 545629e386
5 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
net/uwsgi/Makefile
View file

@ -1,11 +1,11 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=uwsgi PKG_NAME:=uwsgi
PKG_VERSION:=2.0.19.1 PKG_VERSION:=2.0.20
PKG_RELEASE:=1 PKG_RELEASE:=1
PYPI_NAME:=uWSGI PYPI_NAME:=uwsgi
PKG_HASH:=faa85e053c0b1be4d5585b0858d3a511d2cd10201802e8676060fd0a109e5869 PKG_HASH:=88ab9867d8973d8ae84719cf233b7dafc54326fcaec89683c3f9f77c002cdff9
PKG_BUILD_DEPENDS:=python3/host PKG_BUILD_DEPENDS:=python3/host
PYTHON3_PKG_BUILD:=0 PYTHON3_PKG_BUILD:=0
@ -19,9 +19,6 @@ include ../../lang/python/python3-package.mk
#for LINUX_UNAME_VERSION: #for LINUX_UNAME_VERSION:
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
#the .tar.gz does not wrap it into a uWSGI dir; do not use "$(1)/..":
TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
define Package/uwsgi define Package/uwsgi
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network

2
net/uwsgi/patches/001-dont-hardcode-zlib.patch
View file

@ -1,6 +1,6 @@
--- a/uwsgiconfig.py --- a/uwsgiconfig.py
+++ b/uwsgiconfig.py +++ b/uwsgiconfig.py
@@ -856,11 +856,11 @@ class uConf(object): @@ -859,11 +859,11 @@ class uConf(object):
self.cflags.append('-DUWSGI_HAS_EXECINFO') self.cflags.append('-DUWSGI_HAS_EXECINFO')
report['execinfo'] = True report['execinfo'] = True

2
net/uwsgi/patches/002-dont-override-toolchain-optimization.patch
View file

@ -1,6 +1,6 @@
--- a/uwsgiconfig.py --- a/uwsgiconfig.py
+++ b/uwsgiconfig.py +++ b/uwsgiconfig.py
@@ -685,7 +685,7 @@ class uConf(object): @@ -688,7 +688,7 @@ class uConf(object):
self.include_path += os.environ['UWSGI_INCLUDES'].split(',') self.include_path += os.environ['UWSGI_INCLUDES'].split(',')

2
net/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch
View file

@ -1,6 +1,6 @@
--- a/uwsgiconfig.py --- a/uwsgiconfig.py
+++ b/uwsgiconfig.py +++ b/uwsgiconfig.py
@@ -5,9 +5,9 @@ uwsgi_version = '2.0.19.1' @@ -5,9 +5,9 @@ uwsgi_version = '2.0.20'
import os import os
import re import re
import time import time

8
net/uwsgi/patches/020-uwsgiconfig-system-python3.patch
View file

@ -1,8 +0,0 @@
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PYTHON := python
+PYTHON ?= python3
all:
$(PYTHON) uwsgiconfig.py --build $(PROFILE)