From c3b97da1d4239586659940d2fd2d9b7287ea9191 Mon Sep 17 00:00:00 2001 From: "roberto@natty32" Date: Sat, 2 Apr 2011 15:26:00 +0200 Subject: [PATCH] various Riccardo Magliocchetti build fixes --- uwsgi.c | 2 ++ uwsgi.h | 2 ++ uwsgiconfig.py | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/uwsgi.c b/uwsgi.c index 6cbeaf41..a2eefcab 100644 --- a/uwsgi.c +++ b/uwsgi.c @@ -1358,11 +1358,13 @@ int uwsgi_start(void *v_argv) { uwsgi_lock_init(uwsgi.cron_table_lock); } +#ifdef UWSGI_SPOOLER if (uwsgi.spool_dir) { // spooler lock uwsgi.spooler_lock = uwsgi_mmap_shared_lock(); uwsgi_lock_init(uwsgi.spooler_lock); } +#endif uwsgi.rpc_table_lock = uwsgi_mmap_shared_lock(); uwsgi_lock_init(uwsgi.rpc_table_lock); diff --git a/uwsgi.h b/uwsgi.h index efde301f..f1b7c06a 100644 --- a/uwsgi.h +++ b/uwsgi.h @@ -1049,7 +1049,9 @@ struct uwsgi_server { void *rb_timer_table_lock; void *cron_table_lock; void *rpc_table_lock; +#ifdef UWSGI_SPOOLER void *spooler_lock; +#endif void *daemon_table_lock; diff --git a/uwsgiconfig.py b/uwsgiconfig.py index 22e740ff..00cd623e 100644 --- a/uwsgiconfig.py +++ b/uwsgiconfig.py @@ -175,7 +175,7 @@ class uConf(object): self.cflags = self.cflags + [ '-Wextra', '-Wno-unused-parameter', '-Wno-missing-field-initializers' ] self.ldflags = os.environ.get("LDFLAGS", "").split() - self.libs = ['-lpthread', '-rdynamic'] + self.libs = ['-lpthread', '-rdynamic', '-ldl'] # check for inherit option inherit = self.get('inherit')