You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mod_python-commits@quetz.apache.org by jg...@apache.org on 2005/08/20 15:19:19 UTC
svn commit: r234024 - in /httpd/mod_python/trunk: dist/setup.py.in
src/include/mpversion.h
Author: jgallacher
Date: Sat Aug 20 06:19:13 2005
New Revision: 234024
URL: http://svn.apache.org/viewcvs?rev=234024&view=rev
Log:
Applied Graham's setup.py.in-2.diff patch to fix Mac OSX compile problems.
Ref MODPYTHON-65
Modified:
httpd/mod_python/trunk/dist/setup.py.in
httpd/mod_python/trunk/src/include/mpversion.h
Modified: httpd/mod_python/trunk/dist/setup.py.in
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/dist/setup.py.in?rev=234024&r1=234023&r2=234024&view=diff
==============================================================================
--- httpd/mod_python/trunk/dist/setup.py.in (original)
+++ httpd/mod_python/trunk/dist/setup.py.in Sat Aug 20 06:19:13 2005
@@ -157,12 +157,13 @@
from distutils import sysconfig
if sys.platform == "darwin":
- sysconfig._config_vars["LDSHARED"] = \
- string.replace(sysconfig.get_config_var("LDSHARED"), \
- " -bundle "," -bundle -flat_namespace -undefined suppress ")
- sysconfig._config_vars["BLDSHARED"] = \
- string.replace(sysconfig.get_config_var("BLDSHARED"), \
- " -bundle "," -bundle -flat_namespace -undefined suppress ")
+ if not '-undefined' in sysconfig.get_config_var("LDSHARED").split():
+ sysconfig._config_vars["LDSHARED"] = \
+ string.replace(sysconfig.get_config_var("LDSHARED"), \
+ " -bundle "," -bundle -flat_namespace -undefined suppress ")
+ sysconfig._config_vars["BLDSHARED"] = \
+ string.replace(sysconfig.get_config_var("BLDSHARED"), \
+ " -bundle "," -bundle -flat_namespace -undefined suppress ")
setup(name="mod_python",
version=VER,
Modified: httpd/mod_python/trunk/src/include/mpversion.h
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/src/include/mpversion.h?rev=234024&r1=234023&r2=234024&view=diff
==============================================================================
--- httpd/mod_python/trunk/src/include/mpversion.h (original)
+++ httpd/mod_python/trunk/src/include/mpversion.h Sat Aug 20 06:19:13 2005
@@ -1,5 +1,5 @@
#define MPV_MAJOR 3
#define MPV_MINOR 2
#define MPV_PATCH 0
-#define MPV_BUILD 20050816
-#define MPV_STRING "3.2.0-dev-20050816"
+#define MPV_BUILD 20050820
+#define MPV_STRING "3.2.0-dev-20050820"