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

[valholla at users.sourceforge.net]

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

Log Message:
-----------
update patches

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

Modified: csw/mgar/pkg/python/trunk/checksums
===================================================================
--- csw/mgar/pkg/python/trunk/checksums	2009-07-29 20:36:23 UTC (rev 5720)
+++ csw/mgar/pkg/python/trunk/checksums	2009-07-29 20:46:21 UTC (rev 5721)
@@ -7,5 +7,5 @@
 afcc79a94e2f8a576c7906a9700e35a0  download/multiprocess.diff
 05724da367b025ce525de2bb704af6e3  download/pyport.diff
 a1d114e8a20870675649aeef007a9cac  download/python-config-in.diff
-27747dd5678507a99fcaf427d8d5044f  download/setup.diff
+1d2763e140ff30a491b3ce11d1a44f97  download/setup.diff
 d6c86beae46033be70c44c8e0e4c1908  download/site.diff

Modified: csw/mgar/pkg/python/trunk/files/setup.diff
===================================================================
--- csw/mgar/pkg/python/trunk/files/setup.diff	2009-07-29 20:36:23 UTC (rev 5720)
+++ csw/mgar/pkg/python/trunk/files/setup.diff	2009-07-29 20:46:21 UTC (rev 5721)
@@ -1,13 +1,8 @@
-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 @@
+--- Python-2.6.2/setup.py.o	2009-07-29 15:44:48.389269300 -0500
++++ Python-2.6.2/setup.py	2009-07-29 15:43:32.509619500 -0500
+@@ -309,9 +309,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')
@@ -15,10 +10,10 @@
 +        # 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 @@
+@@ -989,7 +989,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.
@@ -27,14 +22,14 @@
          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 @@
+@@ -1300,6 +1300,14 @@
                  )
              libraries = []
-
+ 
 +        elif platform == 'sunos5':
 +            macros = dict(                  # Solaris
-+                HAVE_SEM_OPEN=0,            # Not implemented
-+                HAVE_SEM_TIMEDWAIT=0,       # Not implemented
++                HAVE_SEM_OPEN=0,        # Not Implemented
++                HAVE_SEM_TIMEDWAIT=0,   # Not Implemented
 +                HAVE_FD_TRANSFER=1,
 +                )
 +            libraries = ['rt']
@@ -42,5 +37,3 @@
          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.