Revision: 3029
http://gar.svn.sourceforge.net/gar/?rev=3029&view=rev
Author: valholla
Date: 2009-02-09 16:34:11 +0000 (Mon, 09 Feb 2009)
Log Message:
-----------
update patches
Added Paths:
-----------
csw/mgar/pkg/python/trunk/files/faqwiz.diff
csw/mgar/pkg/python/trunk/files/makesetup.diff
csw/mgar/pkg/python/trunk/files/modules.diff
csw/mgar/pkg/python/trunk/files/multiprocess.diff
csw/mgar/pkg/python/trunk/files/pyport.diff
csw/mgar/pkg/python/trunk/files/setup.diff
Removed Paths:
-------------
csw/mgar/pkg/python/trunk/files/makesetup.diff
csw/mgar/pkg/python/trunk/files/modules.diff
csw/mgar/pkg/python/trunk/files/setup.diff
Added: csw/mgar/pkg/python/trunk/files/faqwiz.diff
===================================================================
--- csw/mgar/pkg/python/trunk/files/faqwiz.diff (rev 0)
+++ csw/mgar/pkg/python/trunk/files/faqwiz.diff 2009-02-09 16:34:11 UTC (rev
3029)
@@ -0,0 +1,11 @@
+--- Python-2.6.1/Tools/faqwiz/faqconf.py 2005-12-11 20:02:24.000000000
-0600
++++ faqconf.py 2009-02-08 18:17:58.938102953 -0600
+@@ -21,7 +21,7 @@
+ OWNEREMAIL = "nob...@anywhere.org" # Email for feedback
+ HOMEURL = "http://www.python.org"; # Related home page
+ HOMENAME = "Python home" # Name of related home page
+-RCSBINDIR = "/usr/local/bin/" # Directory containing RCS commands
++RCSBINDIR = "/opt/csw/bin/" # Directory containing RCS commands
+ # (must end in a slash)
+
+ # Parameters you can normally leave alone
Deleted: csw/mgar/pkg/python/trunk/files/makesetup.diff
===================================================================
--- csw/mgar/pkg/python/trunk/files/makesetup.diff 2009-02-09 16:30:10 UTC
(rev 3028)
+++ csw/mgar/pkg/python/trunk/files/makesetup.diff 2009-02-09 16:34:11 UTC
(rev 3029)
@@ -1,20 +0,0 @@
---- Python-2.6.1/Modules/makesetup 2007-09-05 06:47:34.000000000 -0500
-+++ ./makesetup 2009-02-07 23:03:55.374463810 -0600
-@@ -214,10 +214,15 @@
- glmodule.c) ;;
- /*) ;;
- \$*) ;;
-- *) src='$(srcdir)/'"$srcdir/$src";;
-+ *) src='$(srcdir)/'"$srcdir/$src";;
- esac
- case $doconfig in
-- no) cc="$cc \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";;
-+ no) case $src in
-+ *bsddb.*)
-+ cc="$cc -I\$(DBINC) \$(CCSHARED) \$(CFLAGS)
\$(CPPFLAGS)";;
-+ *)
-+ cc="$cc \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";;
-+ esac;;
- *)
- cc="$cc \$(PY_CFLAGS)";;
- esac
Added: csw/mgar/pkg/python/trunk/files/makesetup.diff
===================================================================
--- csw/mgar/pkg/python/trunk/files/makesetup.diff
(rev 0)
+++ csw/mgar/pkg/python/trunk/files/makesetup.diff 2009-02-09 16:34:11 UTC
(rev 3029)
@@ -0,0 +1,20 @@
+--- Python-2.6.1/Modules/makesetup 2007-09-05 06:47:34.000000000 -0500
++++ ./makesetup 2009-02-07 23:03:55.374463810 -0600
+@@ -214,10 +214,15 @@
+ glmodule.c) ;;
+ /*) ;;
+ \$*) ;;
+- *) src='$(srcdir)/'"$srcdir/$src";;
++ *) src='$(srcdir)/'"$srcdir/$src";;
+ esac
+ case $doconfig in
+- no) cc="$cc \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";;
++ no) case $src in
++ *bsddb.*)
++ cc="$cc -I\$(DBINC) \$(CCSHARED) \$(CFLAGS)
\$(CPPFLAGS)";;
++ *)
++ cc="$cc \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";;
++ esac;;
+ *)
+ cc="$cc \$(PY_CFLAGS)";;
+ esac
Deleted: csw/mgar/pkg/python/trunk/files/modules.diff
===================================================================
--- csw/mgar/pkg/python/trunk/files/modules.diff 2009-02-09 16:30:10 UTC
(rev 3028)
+++ csw/mgar/pkg/python/trunk/files/modules.diff 2009-02-09 16:34:11 UTC
(rev 3029)
@@ -1,15 +0,0 @@
---- Python-2.6.1/Modules/Setup.dist 2008-11-27 04:15:12.000000000 -0600
-+++ Setup.dist 2009-02-08 18:17:58.937507864 -0600
-@@ -363,9 +363,10 @@
- #
- # First, look at Setup.config; configure may have set this for you.
-
--#_curses _cursesmodule.c -lcurses -ltermcap
-+*shared*
-+_curses _cursesmodule.c -lcurses -ltermcap
- # Wrapper for the panel library that's part of ncurses and SYSV curses.
--#_curses_panel _curses_panel.c -lpanel -lncurses
-+_curses_panel _curses_panel.c -lpanel -lcurses -ltermcap
-
-
- # Generic (SunOS / SVR4) dynamic loading module.
Added: csw/mgar/pkg/python/trunk/files/modules.diff
===================================================================
--- csw/mgar/pkg/python/trunk/files/modules.diff
(rev 0)
+++ csw/mgar/pkg/python/trunk/files/modules.diff 2009-02-09 16:34:11 UTC
(rev 3029)
@@ -0,0 +1,15 @@
+--- Python-2.6.1/Modules/Setup.dist 2008-11-27 04:15:12.000000000 -0600
++++ Setup.dist 2009-02-08 18:17:58.937507864 -0600
+@@ -363,9 +363,10 @@
+ #
+ # First, look at Setup.config; configure may have set this for you.
+
+-#_curses _cursesmodule.c -lcurses -ltermcap
++*shared*
++_curses _cursesmodule.c -lcurses -ltermcap
+ # Wrapper for the panel library that's part of ncurses and SYSV curses.
+-#_curses_panel _curses_panel.c -lpanel -lncurses
++_curses_panel _curses_panel.c -lpanel -lcurses -ltermcap
+
+
+ # Generic (SunOS / SVR4) dynamic loading module.
Added: csw/mgar/pkg/python/trunk/files/multiprocess.diff
===================================================================
--- csw/mgar/pkg/python/trunk/files/multiprocess.diff
(rev 0)
+++ csw/mgar/pkg/python/trunk/files/multiprocess.diff 2009-02-09 16:34:11 UTC
(rev 3029)
@@ -0,0 +1,23 @@
+--- Python-2.6.1/Modules/_multiprocessing/multiprocessing.h 2008-11-04
14:43:31.000000000 -0600
++++ ./multiprocessing.h 2009-02-08 11:44:33.901496225 -0600
+@@ -39,6 +39,20 @@
+ #endif
+
+ /*
++ * Solaris 8 missing CMSG_SPACE and CMSG_LEN
++ */
++#ifndef CMSG_SPACE
++# define CMSG_SPACE(l) (_CMSG_DATA_ALIGN(sizeof(struct cmsghdr)) + \
++ _CMSG_HDR_ALIGN(l))
++# warning "assuming 4-byte alignment for CMSG_SPACE"
++#endif /* CMSG_SPACE */
++
++#ifndef CMSG_LEN
++# define CMSG_LEN(l) (_CMSG_DATA_ALIGN(sizeof(struct cmsghdr)) + (l))
++# warning "assuming 4-byte alignment for CMSG_LEN"
++#endif /* CMSG_LEN */
++
++/*
+ * Issue 3110 - Solaris does not define SEM_VALUE_MAX
+ */
+ #ifndef SEM_VALUE_MAX
Added: csw/mgar/pkg/python/trunk/files/pyport.diff
===================================================================
--- csw/mgar/pkg/python/trunk/files/pyport.diff (rev 0)
+++ csw/mgar/pkg/python/trunk/files/pyport.diff 2009-02-09 16:34:11 UTC (rev
3029)
@@ -0,0 +1,14 @@
+--- Python-2.6.1/Include/pyport.h 2008-06-11 02:41:16.000000000 -0500
++++ pyport.h 2009-02-08 18:17:58.936872246 -0600
+@@ -449,11 +449,6 @@
+ in platform-specific #ifdefs.
+ **************************************************************************/
+
+-#ifdef SOLARIS
+-/* Unchecked */
+-extern int gethostname(char *, int);
+-#endif
+-
+ #ifdef __BEOS__
+ /* Unchecked */
+ /* It's in the libs, but not the headers... - [cjh] */
Deleted: csw/mgar/pkg/python/trunk/files/setup.diff
===================================================================
--- csw/mgar/pkg/python/trunk/files/setup.diff 2009-02-09 16:30:10 UTC (rev
3028)
+++ csw/mgar/pkg/python/trunk/files/setup.diff 2009-02-09 16:34:11 UTC (rev
3029)
@@ -1,121 +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,
-@@ -1741,9 +1706,6 @@
- sources=['_ctypes/_ctypes_test.c'])
- self.extensions.extend([ext, ext_test])
-
-- if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
-- return
--
- if sys.platform == 'darwin':
- # OS X 10.5 comes with libffi.dylib; the include files are
- # in /usr/include/ffi
Added: csw/mgar/pkg/python/trunk/files/setup.diff
===================================================================
--- csw/mgar/pkg/python/trunk/files/setup.diff (rev 0)
+++ csw/mgar/pkg/python/trunk/files/setup.diff 2009-02-09 16:34:11 UTC (rev
3029)
@@ -0,0 +1,121 @@
+--- 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,
+@@ -1741,9 +1706,6 @@
+ sources=['_ctypes/_ctypes_test.c'])
+ self.extensions.extend([ext, ext_test])
+
+- if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
+- return
+-
+ if sys.platform == 'darwin':
+ # OS X 10.5 comes with libffi.dylib; the include files are
+ # in /usr/include/ffi
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
