Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=85a2d98a45ab85ae29dc9766ea65d28507adf455
commit 85a2d98a45ab85ae29dc9766ea65d28507adf455 Author: crazy <[email protected]> Date: Sat Feb 10 22:49:06 2018 +0100 uwsgi-2.0.16-1-x86_64 * Version bump * fix hardcoded lua version diff --git a/source/network-extra/uwsgi/FrugalBuild b/source/network-extra/uwsgi/FrugalBuild index c6e4b42..60cb625 100644 --- a/source/network-extra/uwsgi/FrugalBuild +++ b/source/network-extra/uwsgi/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: DeX77 <[email protected]> pkgname=uwsgi -pkgver=2.0.15 +pkgver=2.0.16 pkgdesc="A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C" pkgrel=1 archs=(x86_64) @@ -20,14 +20,15 @@ source=(https://projects.unbit.it/downloads/$pkgname-$pkgver.tar.gz \ [email protected] \ uwsgi_ruby20_compatibility.patch \ avoid_setting_RPATH.patch \ - fix_mono_build.patch ) -sha1sums=('7e2606a6c61a2d6a48f0bb970408336529b7b158' \ + fix_mono_build.patch lua.patch) +sha1sums=('9abfb6838b97c294ca69ea970be81cef490acc33' \ '5a9b549a42e2ad2b45edd3eab9fd359919df6ce9' \ '5b28030d6a28b7a733ea42200360c1880d6bb9c1' \ 'f7acfa534c5222dfaf407f30bda39c11389b7683' \ '485d13c02cf371105217b79316802955316df68a' \ 'a1e8c79cdd9eec420e103217fec1b35bef8ebf19' \ - 'a5c34246940d5dcb56ebaa320079edcc19b25d1f') + 'a5c34246940d5dcb56ebaa320079edcc19b25d1f' \ + 'bcfe91b98655b84b2dcb79f4090801fac5907cb0') replaces=('uwsgi-plugin-gccgo' 'uwsgi-plugin-jvm' 'uwsgi-plugin-objc''uwsgi-plugin-mongodblog' 'uwsgi-plugin-mongodb' 'uwsgi-plugin-gridfs') conflicts=("${replaces[@]}") diff --git a/source/network-extra/uwsgi/lua.patch b/source/network-extra/uwsgi/lua.patch new file mode 100644 index 0000000..009041e --- /dev/null +++ b/source/network-extra/uwsgi/lua.patch @@ -0,0 +1,30 @@ +diff -Naur uwsgi-2.0.16/plugins/lua/uwsgiplugin.py uwsgi-2.0.16-p/plugins/lua/uwsgiplugin.py +--- uwsgi-2.0.16/plugins/lua/uwsgiplugin.py 2018-02-10 11:00:57.000000000 +0100 ++++ uwsgi-2.0.16-p/plugins/lua/uwsgiplugin.py 2018-02-10 22:43:53.367514109 +0100 +@@ -3,7 +3,7 @@ + LUAINC = os.environ.get('UWSGICONFIG_LUAINC') + LUALIB = os.environ.get('UWSGICONFIG_LUALIB') + LUALIBPATH = os.environ.get('UWSGICONFIG_LUALIBPATH') +-LUAPC = os.environ.get('UWSGICONFIG_LUAPC', 'lua5.1') ++LUAPC = os.environ.get('UWSGICONFIG_LUAPC', 'lua') + + # we LUAINC/LUALIB/LUALIBPATH override the LUAPC for backwards compat + if LUAINC: +@@ -12,7 +12,7 @@ + try: + CFLAGS = os.popen('pkg-config --cflags %s' % LUAPC).read().rstrip().split() + except: +- CFLAGS = ['-I/usr/include/lua5.1'] ++ CFLAGS = ['-I/usr/include'] + + if LUALIB: + LIBS = ['-l%s' % LUALIB] +@@ -20,7 +20,7 @@ + try: + LIBS = os.popen('pkg-config --libs %s' % LUAPC).read().rstrip().split() + except: +- LIBS = ['-llua5.1'] ++ LIBS = ['-llua'] + + if LUALIBPATH: + LDFLAGS = ['-L%s' % LUALIBPATH] _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
