[csw-devel] SF.net SVN: gar:[5720] csw/mgar/pkg/python/trunk

[valholla at users.sourceforge.net]

Revision: 5720
          http://gar.svn.sourceforge.net/gar/?rev=5720&view=rev
Author:   valholla
Date:     2009-07-29 20:36:23 +0000 (Wed, 29 Jul 2009)

Log Message:
-----------
cleanup patchfile

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

Modified: csw/mgar/pkg/python/trunk/checksums
===================================================================
--- csw/mgar/pkg/python/trunk/checksums	2009-07-29 20:22:44 UTC (rev 5719)
+++ csw/mgar/pkg/python/trunk/checksums	2009-07-29 20:36:23 UTC (rev 5720)
@@ -4,7 +4,7 @@
 a87896c48b2f61b32053e6d02b07b022  download/libpython2.5.so.1.0-isa-sparcv8
 33f4094ee46ce865d3973a197f3fb4a0  download/makesetup.diff
 22c5f741b1744213eaef0818ab280ad5  download/modules.diff
-1d90f8a385230adfe469cd484e85f046  download/multiprocess.diff
+afcc79a94e2f8a576c7906a9700e35a0  download/multiprocess.diff
 05724da367b025ce525de2bb704af6e3  download/pyport.diff
 a1d114e8a20870675649aeef007a9cac  download/python-config-in.diff
 27747dd5678507a99fcaf427d8d5044f  download/setup.diff

Modified: csw/mgar/pkg/python/trunk/files/multiprocess.diff
===================================================================
--- csw/mgar/pkg/python/trunk/files/multiprocess.diff	2009-07-29 20:22:44 UTC (rev 5719)
+++ csw/mgar/pkg/python/trunk/files/multiprocess.diff	2009-07-29 20:36:23 UTC (rev 5720)
@@ -43,49 +43,3 @@
   * 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.