[csw-devel] SF.net SVN: gar:[5718] csw/mgar/pkg/python/trunk/files/bug3110.diff

[valholla at users.sourceforge.net]

Revision: 5718
          http://gar.svn.sourceforge.net/gar/?rev=5718&view=rev
Author:   valholla
Date:     2009-07-29 19:52:31 +0000 (Wed, 29 Jul 2009)

Log Message:
-----------
changes to setup for multiprocessing

Modified Paths:
--------------
    csw/mgar/pkg/python/trunk/files/bug3110.diff

Modified: csw/mgar/pkg/python/trunk/files/bug3110.diff
===================================================================
--- csw/mgar/pkg/python/trunk/files/bug3110.diff	2009-07-29 19:08:26 UTC (rev 5717)
+++ csw/mgar/pkg/python/trunk/files/bug3110.diff	2009-07-29 19:52:31 UTC (rev 5718)
@@ -19,4 +19,50 @@
 +/*
   * Make sure Py_ssize_t available
   */
- 
+
+Index: setup.diff
+===================================================================
+--- setup.diff  (revision 5088)
++++ setup.diff  (working copy)
+@@ -1,111 +0,0 @@
+--- Python-2.6.1/setup.py      2008-11-04 14:43:31.000000000 -0600
++++ ./setup.py 2009-02-08 18:25:38.412651662 -0600
+@@ -309,9 +310,9 @@
+         return sys.platform
+
+     def detect_modules(self):
+-        # Ensure that /usr/local is always used
+-        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+-        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
++        # Ensure that /opt/csw is always used
++        add_dir_to_list(self.compiler.library_dirs, '/opt/csw/lib')
++        add_dir_to_list(self.compiler.include_dirs, '/opt/csw/include')
+
+         # Add paths specified in the environment variables LDFLAGS and
+         # CPPFLAGS for header and library files.
+@@ -988,7 +944,7 @@
+         # we do not build this one.  Otherwise this build will pick up
+         # the more recent berkeleydb's db.h file first in the include path
+         # when attempting to compile and it will fail.
+-        f = "/usr/include/db.h"
++        f = "/opt/csw/include/db_185.h"
+         if os.path.exists(f) and not db_incs:
+             data = open(f).read()
+             m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
+@@ -1279,6 +1236,14 @@
+                 )
+             libraries = []
+
++        elif platform == 'sunos5':
++            macros = dict(                  # Solaris
++                HAVE_SEM_OPEN=0,            # Not implemented
++                HAVE_SEM_TIMEDWAIT=0,       # Not implemented
++                HAVE_FD_TRANSFER=1,
++                )
++            libraries = ['rt']
++
+         else:                                   # Linux and other unices
+             macros = dict(
+                 HAVE_SEM_OPEN=1,
+
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.