kad pushed to uwsgi (el6). "There is a method to this madness, you know."

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Apr 21 22:42:21 UTC 2015


>From d75a395424d882c0c5363dca6733326d1ba391f5 Mon Sep 17 00:00:00 2001
From: Jorge Gallegos <kad at fedoraproject.org>
Date: Tue, 21 Apr 2015 09:47:05 -0700
Subject: There is a method to this madness, you know.


diff --git a/fedora.ini b/fedora.ini
index 3e6bf94..023b04a 100644
--- a/fedora.ini
+++ b/fedora.ini
@@ -9,4 +9,4 @@ routing = auto
 ssl = auto
 malloc_implementation = libc
 embedded_plugins = corerouter, echo, ping
-plugins = alarm_curl, alarm_xmpp, airbrake, cache, carbon, cgi, cplusplus, curl_cron, dumbloop, fastrouter, forkptyrouter, geoip, gevent, graylog2, http, jvm, jwsgi, ldap, logcrypto, logfile, logpipe, logsocket, lua, mongodblog, mono, msgpack, nagios, pam, php, psgi, pty, python, rack, rawrouter, redislog, ring, router_access, router_basicauth, router_cache, router_expires, router_hash, router_http, router_memcached, router_metrics, router_radius, router_redirect, router_redis, router_rewrite, router_spnego, router_static, router_uwsgi, router_xmldir, rpc, rrdtool, rsyslog, ruby19, spooler, sqlite3, ssi, sslrouter, stats_pusher_file, stats_pusher_mongodb, stats_pusher_socket, stats_pusher_statsd, syslog, tornado, transformation_chunked, transformation_gzip, transformation_offload, transformation_template, transformation_tofile, transformation_toupper, ugreen, v8, webdav, xattr, xslt, zabbix, zergpool
+plugins = alarm_curl, alarm_xmpp, airbrake, cache, carbon, cgi, cplusplus, curl_cron, dumbloop, fastrouter, forkptyrouter, geoip, gevent, graylog2, http, jvm, jwsgi, ldap, logcrypto, logfile, logpipe, logsocket, lua, msgpack, nagios, pam, php, psgi, pty, python, rack, rawrouter, redislog, ring, router_access, router_basicauth, router_cache, router_expires, router_hash, router_http, router_memcached, router_metrics, router_radius, router_redirect, router_redis, router_rewrite, router_spnego, router_static, router_uwsgi, router_xmldir, rpc, rrdtool, rsyslog, ruby19, spooler, sqlite3, ssi, sslrouter, stats_pusher_file, stats_pusher_socket, stats_pusher_statsd, syslog, tornado, transformation_chunked, transformation_gzip, transformation_offload, transformation_template, transformation_tofile, transformation_toupper, ugreen, webdav, xattr, xslt, zabbix, zergpool
diff --git a/uwsgi.spec b/uwsgi.spec
index 8fbce14..3b57ad1 100644
--- a/uwsgi.spec
+++ b/uwsgi.spec
@@ -1021,27 +1021,18 @@ echo "plugin_dir = %{_libdir}/%{name}" >> buildconf/$(basename %{SOURCE1})
 %endif
 %patch6 -p1 -b .ppc64le
 
-#disable plug-ins
-%if %{without mongodblibs}
-sed -in "s/mongodblog, //" buildconf/fedora.ini
-sed -in "s/stats_pusher_mongodb, //" buildconf/fedora.ini
-%endif
-%if %{without v8}
-sed -in "s/v8, //" buildconf/fedora.ini
-%endif
-%if %{without gridfs}
-sed -in "s/gridfs, //" buildconf/fedora.ini
-%endif
-%if %{without mono}
-sed -in "s/mono, //" buildconf/fedora.ini
-%endif
-
 
 %build
-%if %{with mongodblibs}
 CFLAGS="%{optflags} -Wno-error -Wno-unused-but-set-variable" python uwsgiconfig.py --build fedora.ini
-%else
-UWSGI_MONGODB_NOLIB=1 CFLAGS="%{optflags} -Wno-error -Wno-unused-but-set-variable" python uwsgiconfig.py --build fedora.ini
+%if %{with mongodblibs}
+CFLAGS="%{optflags} -Wno-unused-but-set-variable" python3 uwsgiconfig.py --plugin plugins/mongodblog fedora
+CFLAGS="%{optflags} -Wno-unused-but-set-variable" python3 uwsgiconfig.py --plugin plugins/stats_pusher_mongodb fedora
+%endif
+%if %{with mono}
+CFLAGS="%{optflags} -Wno-unused-but-set-variable" python3 uwsgiconfig.py --plugin plugins/mono fedora
+%endif
+%if %{with v8}
+CFLAGS="%{optflags} -Wno-unused-but-set-variable" python3 uwsgiconfig.py --plugin plugins/v8 fedora
 %endif
 %if %{with python3}
 CFLAGS="%{optflags} -Wno-unused-but-set-variable" python3 uwsgiconfig.py --plugin plugins/python fedora python3
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/uwsgi.git/commit/?h=el6&id=d75a395424d882c0c5363dca6733326d1ba391f5


More information about the scm-commits mailing list