[csw-devel] SF.net SVN: gar:[5714] csw/mgar/pkg/python/trunk
valholla at users.sourceforge.net
valholla at users.sourceforge.net
Wed Jul 29 18:52:59 CEST 2009
Revision: 5714
http://gar.svn.sourceforge.net/gar/?rev=5714&view=rev
Author: valholla
Date: 2009-07-29 16:52:59 +0000 (Wed, 29 Jul 2009)
Log Message:
-----------
update for python bugid 3110
Modified Paths:
--------------
csw/mgar/pkg/python/trunk/Makefile
csw/mgar/pkg/python/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/python/trunk/files/bug3110.diff
Removed Paths:
-------------
csw/mgar/pkg/python/trunk/files/setup.diff
Modified: csw/mgar/pkg/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/python/trunk/Makefile 2009-07-29 16:23:51 UTC (rev 5713)
+++ csw/mgar/pkg/python/trunk/Makefile 2009-07-29 16:52:59 UTC (rev 5714)
@@ -34,9 +34,9 @@
PATCHFILES += modules.diff
PATCHFILES += multiprocess.diff
PATCHFILES += pyport.diff
-PATCHFILES += setup.diff
PATCHFILES += site.diff
PATCHFILES += python-config-in.diff
+PATCHFILES += bug3110.diff
# Test for sunaudiodev fails.
SKIPTEST = 1
@@ -93,7 +93,7 @@
ENABLE_CHECK = 0
REQUIRED_PKGS_CSWidle = CSWpython CSWpython-tk CSWcswclassutils
-REQUIRED_PKGS_CSWpython = CSWbdb44 CSWbzip2 CSWgdbm CSWggettextrt
+REQUIRED_PKGS_CSWpython = CSWbdb CSWbzip2 CSWgdbm CSWggettextrt
REQUIRED_PKGS_CSWpython += CSWncurses CSWosslrt CSWpython-rt CSWreadline
REQUIRED_PKGS_CSWpython += CSWsqlite3rt CSWzlib CSWcswclassutils
REQUIRED_PKGS_CSWpython-tk = CSWpython CSWtcl CSWtk
Modified: csw/mgar/pkg/python/trunk/checksums
===================================================================
--- csw/mgar/pkg/python/trunk/checksums 2009-07-29 16:23:51 UTC (rev 5713)
+++ csw/mgar/pkg/python/trunk/checksums 2009-07-29 16:52:59 UTC (rev 5714)
@@ -1,4 +1,5 @@
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
@@ -7,5 +8,5 @@
369c5593c0c0edda03f3c1844788dbee download/multiprocess.diff
05724da367b025ce525de2bb704af6e3 download/pyport.diff
a1d114e8a20870675649aeef007a9cac download/python-config-in.diff
-48577bbc43b912a4df66d09b54bd61ae download/setup.diff
+a17bf564b83d6b7821405b6b5ac043c1 download/setup.diff
d6c86beae46033be70c44c8e0e4c1908 download/site.diff
Added: csw/mgar/pkg/python/trunk/files/bug3110.diff
===================================================================
--- csw/mgar/pkg/python/trunk/files/bug3110.diff (rev 0)
+++ csw/mgar/pkg/python/trunk/files/bug3110.diff 2009-07-29 16:52:59 UTC (rev 5714)
@@ -0,0 +1,22 @@
+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
+ */
+
Deleted: csw/mgar/pkg/python/trunk/files/setup.diff
===================================================================
--- csw/mgar/pkg/python/trunk/files/setup.diff 2009-07-29 16:23:51 UTC (rev 5713)
+++ csw/mgar/pkg/python/trunk/files/setup.diff 2009-07-29 16:52:59 UTC (rev 5714)
@@ -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
-@@ -129,7 +129,8 @@
- moddir = os.path.normpath(moddir)
-
- moddirlist = [moddir]
-- incdirlist = ['./Include']
-+ incdirlist = ['/opt/csw/bdb44/include']
-+ incdirlist.append('./Include')
-
- # Platform-dependent module source and include directories
- platform = self.get_platform()
-@@ -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.
-@@ -739,52 +740,7 @@
-
- # construct a list of paths to look for the header file in on
- # top of the normal inc_dirs.
-- db_inc_paths = [
-- '/usr/include/db4',
-- '/usr/local/include/db4',
-- '/opt/sfw/include/db4',
-- '/usr/include/db3',
-- '/usr/local/include/db3',
-- '/opt/sfw/include/db3',
-- # Fink defaults (http://fink.sourceforge.net/)
-- '/sw/include/db4',
-- '/sw/include/db3',
-- ]
-- # 4.x minor number specific paths
-- for x in gen_db_minor_ver_nums(4):
-- db_inc_paths.append('/usr/include/db4%d' % x)
-- db_inc_paths.append('/usr/include/db4.%d' % x)
-- db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
-- db_inc_paths.append('/usr/local/include/db4%d' % x)
-- db_inc_paths.append('/pkg/db-4.%d/include' % x)
-- db_inc_paths.append('/opt/db-4.%d/include' % x)
-- # MacPorts default (http://www.macports.org/)
-- db_inc_paths.append('/opt/local/include/db4%d' % x)
-- # 3.x minor number specific paths
-- for x in gen_db_minor_ver_nums(3):
-- db_inc_paths.append('/usr/include/db3%d' % x)
-- db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x)
-- db_inc_paths.append('/usr/local/include/db3%d' % x)
-- db_inc_paths.append('/pkg/db-3.%d/include' % x)
-- db_inc_paths.append('/opt/db-3.%d/include' % x)
--
-- # Add some common subdirectories for Sleepycat DB to the list,
-- # based on the standard include directories. This way DB3/4 gets
-- # picked up when it is installed in a non-standard prefix and
-- # the user has added that prefix into inc_dirs.
-- std_variants = []
-- for dn in inc_dirs:
-- std_variants.append(os.path.join(dn, 'db3'))
-- std_variants.append(os.path.join(dn, 'db4'))
-- for x in gen_db_minor_ver_nums(4):
-- std_variants.append(os.path.join(dn, "db4%d"%x))
-- std_variants.append(os.path.join(dn, "db4.%d"%x))
-- for x in gen_db_minor_ver_nums(3):
-- std_variants.append(os.path.join(dn, "db3%d"%x))
-- std_variants.append(os.path.join(dn, "db3.%d"%x))
--
-- db_inc_paths = std_variants + db_inc_paths
-- db_inc_paths = [p for p in db_inc_paths if os.path.exists(p)]
-+ db_inc_paths = [ '/opt/csw/bdb44/include' ]
-
- db_ver_inc_map = {}
-
-@@ -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/bdb44/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)
-@@ -1239,6 +1195,7 @@
- self.detect_ctypes(inc_dirs, lib_dirs)
-
- # Richard Oudkerk's multiprocessing module
-+
- if platform == 'win32': # Windows
- macros = dict()
- libraries = ['ws2_32']
-@@ -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