[csw-devel] SF.net SVN: gar:[5719] csw/mgar/pkg/python/trunk
valholla at users.sourceforge.net
valholla at users.sourceforge.net
Wed Jul 29 22:22:44 CEST 2009
Revision: 5719
http://gar.svn.sourceforge.net/gar/?rev=5719&view=rev
Author: valholla
Date: 2009-07-29 20:22:44 +0000 (Wed, 29 Jul 2009)
Log Message:
-----------
multiprocess fixes
Modified Paths:
--------------
csw/mgar/pkg/python/trunk/Makefile
csw/mgar/pkg/python/trunk/checksums
csw/mgar/pkg/python/trunk/files/multiprocess.diff
Added Paths:
-----------
csw/mgar/pkg/python/trunk/files/setup.diff
Removed Paths:
-------------
csw/mgar/pkg/python/trunk/files/bug3110.diff
Modified: csw/mgar/pkg/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/python/trunk/Makefile 2009-07-29 19:52:31 UTC (rev 5718)
+++ csw/mgar/pkg/python/trunk/Makefile 2009-07-29 20:22:44 UTC (rev 5719)
@@ -36,7 +36,7 @@
PATCHFILES += pyport.diff
PATCHFILES += site.diff
PATCHFILES += python-config-in.diff
-PATCHFILES += bug3110.diff
+PATCHFILES += setup.diff
# Test for sunaudiodev fails.
SKIPTEST = 1
Modified: csw/mgar/pkg/python/trunk/checksums
===================================================================
--- csw/mgar/pkg/python/trunk/checksums 2009-07-29 19:52:31 UTC (rev 5718)
+++ csw/mgar/pkg/python/trunk/checksums 2009-07-29 20:22:44 UTC (rev 5719)
@@ -1,12 +1,11 @@
245db9f1e0f09ab7e0faaa0cf7301011 download/Python-2.6.2.tar.bz2
-b241ac27f9eacaa1a4850d88c60a96d7 download/bug3110.diff
42dd6523beb94a805d5764ae1276091c download/faqwiz.diff
5664b3970307d7d39d8d4061e7dccbb0 download/libpython2.5.so.1.0-isa-i386
a87896c48b2f61b32053e6d02b07b022 download/libpython2.5.so.1.0-isa-sparcv8
33f4094ee46ce865d3973a197f3fb4a0 download/makesetup.diff
22c5f741b1744213eaef0818ab280ad5 download/modules.diff
-369c5593c0c0edda03f3c1844788dbee download/multiprocess.diff
+1d90f8a385230adfe469cd484e85f046 download/multiprocess.diff
05724da367b025ce525de2bb704af6e3 download/pyport.diff
a1d114e8a20870675649aeef007a9cac download/python-config-in.diff
-a17bf564b83d6b7821405b6b5ac043c1 download/setup.diff
+27747dd5678507a99fcaf427d8d5044f download/setup.diff
d6c86beae46033be70c44c8e0e4c1908 download/site.diff
Deleted: csw/mgar/pkg/python/trunk/files/bug3110.diff
===================================================================
--- csw/mgar/pkg/python/trunk/files/bug3110.diff 2009-07-29 19:52:31 UTC (rev 5718)
+++ csw/mgar/pkg/python/trunk/files/bug3110.diff 2009-07-29 20:22:44 UTC (rev 5719)
@@ -1,68 +0,0 @@
-Index: Python-2.6.2/Modules/_multiprocessing/multiprocessing.h
-===================================================================
---- Python-2.6.2/Modules/_multiprocessing/multiprocessing.h (revision 66181)
-+++ Python-2.6.2/Modules/_multiprocessing/multiprocessing.h (working copy)
-@@ -37,6 +37,17 @@
- #endif
-
- /*
-+ * Issue 3110 - Solaris does not define SEM_VALUE_MAX
-+ */
-+#ifndef SEM_VALUE_MAX
-+# ifdef _SEM_VALUE_MAX
-+# define SEM_VALUE_MAX _SEM_VALUE_MAX
-+# else
-+# define SEM_VALUE_MAX INT_MAX
-+# endif
-+#endif
-+
-+/*
- * 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,
-
-
Modified: csw/mgar/pkg/python/trunk/files/multiprocess.diff
===================================================================
--- csw/mgar/pkg/python/trunk/files/multiprocess.diff 2009-07-29 19:52:31 UTC (rev 5718)
+++ csw/mgar/pkg/python/trunk/files/multiprocess.diff 2009-07-29 20:22:44 UTC (rev 5719)
@@ -21,3 +21,71 @@
* Issue 3110 - Solaris does not define SEM_VALUE_MAX
*/
#ifndef SEM_VALUE_MAX
+Index: Python-2.6.2/Modules/_multiprocessing/multiprocessing.h
+===================================================================
+--- Python-2.6.2/Modules/_multiprocessing/multiprocessing.h (revision 66181)
++++ Python-2.6.2/Modules/_multiprocessing/multiprocessing.h (working copy)
+@@ -37,6 +37,17 @@
+ #endif
+
+ /*
++ * Issue 3110 - Solaris does not define SEM_VALUE_MAX
++ */
++#ifndef SEM_VALUE_MAX
++# ifdef _SEM_VALUE_MAX
++# define SEM_VALUE_MAX _SEM_VALUE_MAX
++# else
++# define SEM_VALUE_MAX INT_MAX
++# endif
++#endif
++
++/*
+ * 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,
+
+
Copied: csw/mgar/pkg/python/trunk/files/setup.diff (from rev 5718, csw/mgar/pkg/python/trunk/files/bug3110.diff)
===================================================================
--- csw/mgar/pkg/python/trunk/files/setup.diff (rev 0)
+++ csw/mgar/pkg/python/trunk/files/setup.diff 2009-07-29 20:22:44 UTC (rev 5719)
@@ -0,0 +1,46 @@
+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.
More information about the devel
mailing list