Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=50805eecfbe964f994dee4b26ccb76c97c1ae685
commit 50805eecfbe964f994dee4b26ccb76c97c1ae685 Author: DeX77 <[email protected]> Date: Wed Mar 1 15:45:40 2017 +0100 uwsgi-2.0.14-2-x86_64 * rebuild + add some patches for mono diff --git a/source/network-extra/uwsgi/FrugalBuild b/source/network-extra/uwsgi/FrugalBuild index d4e1c1c..be59a4e 100644 --- a/source/network-extra/uwsgi/FrugalBuild +++ b/source/network-extra/uwsgi/FrugalBuild @@ -4,8 +4,8 @@ pkgname=uwsgi pkgver=2.0.14 pkgdesc="A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C" -pkgrel=1 -archs=(i686 x86_64) +pkgrel=2 +archs=(x86_64) groups=('network-extra') url="http://projects.unbit.it/$pkname"; license=(GPL2) @@ -14,16 +14,20 @@ depends=('glibc>=2.24-4') makedepends=('libyaml' 'pcre' 'libedit' 'openssl>=1.0.2-10' 'gmp' 'jansson' ' postgresql>=9.5.4') _F_github_author="unbit" Finclude mono github -source=("${source[@]}" +source=(https://projects.unbit.it/downloads/$pkgname-$pkgver.tar.gz \ uwsgi_trick_chroot.patch \ [email protected] \ [email protected] \ - uwsgi_ruby20_compatibility.patch ) + uwsgi_ruby20_compatibility.patch \ + avoid_setting_RPATH.patch \ + fix_mono_build.patch ) sha1sums=('b500ed76dd791d09ce57304c55b724ca74b2ab9b' \ '5a9b549a42e2ad2b45edd3eab9fd359919df6ce9' \ '5b28030d6a28b7a733ea42200360c1880d6bb9c1' \ 'f7acfa534c5222dfaf407f30bda39c11389b7683' \ - '485d13c02cf371105217b79316802955316df68a') + '485d13c02cf371105217b79316802955316df68a' \ + 'a1e8c79cdd9eec420e103217fec1b35bef8ebf19' \ + 'a5c34246940d5dcb56ebaa320079edcc19b25d1f') replaces=('uwsgi-plugin-gccgo' 'uwsgi-plugin-jvm' 'uwsgi-plugin-objc''uwsgi-plugin-mongodblog' 'uwsgi-plugin-mongodb' 'uwsgi-plugin-gridfs') conflicts=("${replaces[@]}") @@ -97,7 +101,7 @@ subdescs=("UWSGI Ruby Rack Plugin" "UWSGI Alarm XMPP Plugin" "UWSGI FFI Plugin" "UWSGI C++ Plugin") -subdepends=('ruby>=2.1.2' +subdepends=('ruby>=2.4' 'perl' 'python-greenlet' '' @@ -117,11 +121,11 @@ subdepends=('ruby>=2.1.2' 'pyzmq' 'libxml2' 'libxml2 libssh2' - 'ruby>=2.1.2' + 'ruby>=2.4' 'zeromq' 'systemd' 'curl' - 'gloox>=1.0.17' + 'gloox>=1.0.20' 'libffi' 'libstdc++>=6.2.1-5') @@ -181,42 +185,40 @@ subgroups=('network-extra' 'network-extra' 'network-extra') -subarchs=('i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64') +subarchs=('x86_64' + 'x86_64' + 'x86_64' + 'x86_64' + 'x86_64' + 'x86_64' + 'x86_64' + 'x86_64' + 'x86_64' + 'x86_64' + 'x86_64' + 'x86_64' + 'x86_64' + 'x86_64' + 'x86_64' + 'x86_64' + 'x86_64' + 'x86_64' + 'x86_64' + 'x86_64' + 'x86_64' + 'x86_64' + 'x86_64' + 'x86_64' + 'x86_64' + 'x86_64' + 'x86_64') build(){ Fcd Fpatchall Fsed "verbose_build = False" "verbose_build = True" uwsgiconfig.py - ## lua - Fsed 'include/lua5.1' 'include' plugins/lua/uwsgiplugin.py - Fsed 'lua5.1' 'lua' plugins/lua/uwsgiplugin.py + #First build core Fexec python uwsgiconfig.py --build base || Fdie diff --git a/source/network-extra/uwsgi/avoid_setting_RPATH.patch b/source/network-extra/uwsgi/avoid_setting_RPATH.patch new file mode 100644 index 0000000..56155ea --- /dev/null +++ b/source/network-extra/uwsgi/avoid_setting_RPATH.patch @@ -0,0 +1,32 @@ +Description: Remove value assignments to environment variable LD_RUN_PATH + Value assignment to environment variable LD_RUN_PATH leads to setting RPATH in + compiled binary/shared library. + . + And then Lintian reports about error (E: binary-or-shlib-defines-rpath). +Author: Leonid Borisenko <[email protected]> +Author: Janos Guljas <[email protected]> +Forwarded: not-needed +Last-Update: 2016-02-08 + +--- a/plugins/rack/uwsgiplugin.py ++++ b/plugins/rack/uwsgiplugin.py +@@ -46,7 +46,6 @@ + + if has_shared == 'yes': + LDFLAGS.append('-L' + libpath ) +- os.environ['LD_RUN_PATH'] = libpath + LIBS.append(os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip()) + else: + rubylibdir = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['rubylibdir']\"").read().rstrip() +--- a/plugins/python/uwsgiplugin.py ++++ b/plugins/python/uwsgiplugin.py +@@ -56,9 +56,6 @@ + libdir = "%s/lib" % sysconfig.PREFIX + + LDFLAGS.append("-L%s" % libdir) +- LDFLAGS.append("-Wl,-rpath,%s" % libdir) +- +- os.environ['LD_RUN_PATH'] = "%s" % libdir + + LIBS.append('-lpython%s' % get_python_version()) + else: diff --git a/source/network-extra/uwsgi/fix_mono_build.patch b/source/network-extra/uwsgi/fix_mono_build.patch new file mode 100644 index 0000000..bb4c782 --- /dev/null +++ b/source/network-extra/uwsgi/fix_mono_build.patch @@ -0,0 +1,10 @@ +--- uwsgi-2.0.14/plugins/mono/uwsgiplugin.py 2016-10-03 10:16:59.000000000 +0200 ++++ uwsgi-2.0.14.new/plugins/mono/uwsgiplugin.py 2017-03-01 15:42:22.000000000 +0100 +@@ -2,6 +2,7 @@ + NAME='mono' + + CFLAGS = os.popen('pkg-config --cflags mono-2').read().rstrip().split() ++CFLAGS.extend(["-I/usr/include/glib-2.0", "-I/usr/include", "-I/usr/lib/glib-2.0/include"]) + LDFLAGS = [] + LIBS = os.popen('pkg-config --libs mono-2').read().rstrip().split() + GCC_LIST = ['mono_plugin'] _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
