From 2c463ad6af6af66e1b364fde26b030634decfbf0 Mon Sep 17 00:00:00 2001
From: "roberto@sirius" <roberto@sirius>
Date: Wed, 31 Aug 2011 12:02:19 +0200
Subject: [PATCH] a test for libless pyuwsgi

---
 buildconf/pyuwsgi.ini          |  2 +-
 plugins/python/uwsgiplugin.py  | 29 ++++++++++++++++-------------
 plugins/pyuwsgi/uwsgiplugin.py |  3 +++
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/buildconf/pyuwsgi.ini b/buildconf/pyuwsgi.ini
index 8ebf335d..75d36dd2 100644
--- a/buildconf/pyuwsgi.ini
+++ b/buildconf/pyuwsgi.ini
@@ -1,5 +1,5 @@
 [uwsgi]
 inherit = default
 bin_name = pyuwsgi.so
-embedded_plugins = +,pyuwsgi
+embedded_plugins = pyuwsgi,python,ping,cache,nagios,rpc,ugreen
 as_shared_library = true
diff --git a/plugins/python/uwsgiplugin.py b/plugins/python/uwsgiplugin.py
index ffffec3c..3a8832f4 100644
--- a/plugins/python/uwsgiplugin.py
+++ b/plugins/python/uwsgiplugin.py
@@ -8,24 +8,27 @@ GCC_LIST = ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_heade
 CFLAGS = ['-I' + sysconfig.get_python_inc(), '-I' + sysconfig.get_python_inc(plat_specific=True) ] 
 LDFLAGS = []
 
-LIBS = sysconfig.get_config_var('LIBS').split() + sysconfig.get_config_var('SYSLIBS').split()
-if not sysconfig.get_config_var('Py_ENABLE_SHARED'):
+if not 'UWSGI_PYTHON_NOLIB' in os.environ:
+    LIBS = sysconfig.get_config_var('LIBS').split() + sysconfig.get_config_var('SYSLIBS').split()
+    if not sysconfig.get_config_var('Py_ENABLE_SHARED'):
         LIBS.append('-L' + sysconfig.get_config_var('LIBPL'))
-else:
+    else:
 	try:
-		LDFLAGS.append("-L%s" % sysconfig.get_config_var('LIBDIR'))
-		os.environ['LD_RUN_PATH'] = "%s" % (sysconfig.get_config_var('LIBDIR'))
+	    LDFLAGS.append("-L%s" % sysconfig.get_config_var('LIBDIR'))
+	    os.environ['LD_RUN_PATH'] = "%s" % (sysconfig.get_config_var('LIBDIR'))
 	except:
-		LDFLAGS.append("-L%s/lib" % sysconfig.PREFIX)
-		os.environ['LD_RUN_PATH'] = "%s/lib" % sysconfig.PREFIX
+	    LDFLAGS.append("-L%s/lib" % sysconfig.PREFIX)
+	    os.environ['LD_RUN_PATH'] = "%s/lib" % sysconfig.PREFIX
 
 
-version = sysconfig.get_config_var('VERSION')
-try:
-    version = version + sys.abiflags
-except:
-    pass
-LIBS.append('-lpython' + version)
+    version = sysconfig.get_config_var('VERSION')
+    try:
+        version = version + sys.abiflags
+    except:
+        pass
+    LIBS.append('-lpython' + version)
+else:
+    LIBS = []
 
 #if str(PYLIB_PATH) != '':
 #                libs.insert(0,'-L' + PYLIB_PATH)
diff --git a/plugins/pyuwsgi/uwsgiplugin.py b/plugins/pyuwsgi/uwsgiplugin.py
index f96f5ada..a74c5a22 100644
--- a/plugins/pyuwsgi/uwsgiplugin.py
+++ b/plugins/pyuwsgi/uwsgiplugin.py
@@ -1,4 +1,7 @@
 from distutils import sysconfig
+import os
+
+os.environ['UWSGI_PYTHON_NOLIB'] = '1'
 
 NAME='pyuwsgi'
 CFLAGS = ['-I' + sysconfig.get_python_inc(), '-I' + sysconfig.get_python_inc(plat_specific=True)]