[csw-devel] SF.net SVN: gar:[21529] csw/mgar/pkg/lang-python/python/branches/python-2.7
pfelecan at users.sourceforge.net
pfelecan at users.sourceforge.net
Fri Jul 19 09:37:22 CEST 2013
Revision: 21529
http://gar.svn.sourceforge.net/gar/?rev=21529&view=rev
Author: pfelecan
Date: 2013-07-19 07:37:08 +0000 (Fri, 19 Jul 2013)
Log Message:
-----------
lang-python/python/branches/python-2.7:
- delete old patches
- add unversioned tree at the end of the modules search path
Modified Paths:
--------------
csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile
Added Paths:
-----------
csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-manage-previous-site-package.patch
Removed Paths:
-------------
csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-FFI_DEFAULT_ABI-to-use-__i386.patch
csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-setup.patch
csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0002-faqwiz.patch
csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0003-makesetup.patch
csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0004-modules.patch
csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0005-multiprocess.patch
csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0006-python-config-in.patch
csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0007-pyport.patch
csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0008-site.patch
csw/mgar/pkg/lang-python/python/branches/python-2.7/files/getpass.patch
csw/mgar/pkg/lang-python/python/branches/python-2.7/files/patch_2.diff.txt
csw/mgar/pkg/lang-python/python/branches/python-2.7/files/site.diff
Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-18 15:20:11 UTC (rev 21528)
+++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-07-19 07:37:08 UTC (rev 21529)
@@ -6,7 +6,6 @@
DVER = 2-7
UVER = 2_7
PVER = python$(VER)
-# I wish to replace 2.6 by 2.7:
CVER = 27
# Known issues:
@@ -37,29 +36,8 @@
DISTFILES = $(DISTNAME).tar.bz2
DISTFILES += pyport.h
-# Patches
-# PATCHFILES += 0001-setup.patch
-# PATCHFILES += 0002-faqwiz.patch
-# PATCHFILES += 0003-makesetup.patch
-# PATCHFILES += 0004-modules.patch
-# PATCHFILES += 0005-multiprocess.patch
-# PATCHFILES += 0006-python-config-in.patch
-# PATCHFILES += 0007-pyport.patch
-# # after experiments and failures I think that with the upstream
-# # byzantine build system using a generic /opt/csw/lib/python directory
-# # is not such a good idea, e.g. there are interferences in early
-# # stages of the build when not all shared objects are built,
-# # e.g. cStringIO, and the system falls back on the 2.6 provided one,
-# # if the previous version is installed, and havoc ensues... Building
-# # without previous Python installed works.
-# PATCHFILES += 0008-site.patch
+PATCHFILES += 0001-manage-previous-site-package.patch
-# # TODO: evaluate the following patches from this branch files directory:
-# # 0001-FFI_DEFAULT_ABI-to-use-__i386.patch
-# # getpass.patch
-# # patch_2.diff.txt
-# # and review the complement patches from the trunk's files directory
-
# The test for sunaudiodev fails. Not that it's a good practice to skip
# tests.
#SKIPTEST = 1
Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-FFI_DEFAULT_ABI-to-use-__i386.patch
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-FFI_DEFAULT_ABI-to-use-__i386.patch 2013-07-18 15:20:11 UTC (rev 21528)
+++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-FFI_DEFAULT_ABI-to-use-__i386.patch 2013-07-19 07:37:08 UTC (rev 21529)
@@ -1,29 +0,0 @@
-From a793e4025581c9840eb053d57368aa74cb8e3e87 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Thu, 20 May 2010 18:07:22 +0200
-Subject: [PATCH] FFI_DEFAULT_ABI to use __i386
-
----
- Modules/_ctypes/libffi/src/x86/ffitarget.h | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Modules/_ctypes/libffi/src/x86/ffitarget.h b/Modules/_ctypes/libffi/src/x86/ffitarget.h
-index 8178d06..d54d210 100644
---- a/Modules/_ctypes/libffi/src/x86/ffitarget.h
-+++ b/Modules/_ctypes/libffi/src/x86/ffitarget.h
-@@ -54,10 +54,10 @@ typedef enum ffi_abi {
- #endif
-
- /* ---- Intel x86 and AMD x86-64 - */
--#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__))
-+#if !defined(X86_WIN32) && (defined(__i386__) || defined(__i386) || defined(__x86_64__))
- FFI_SYSV,
- FFI_UNIX64, /* Unix variants all use the same ABI for x86-64 */
--#ifdef __i386__
-+#if defined(__i386__) || defined(__i386)
- FFI_DEFAULT_ABI = FFI_SYSV,
- #else
- FFI_DEFAULT_ABI = FFI_UNIX64,
---
-1.7.1
-
Added: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-manage-previous-site-package.patch
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-manage-previous-site-package.patch (rev 0)
+++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-manage-previous-site-package.patch 2013-07-19 07:37:08 UTC (rev 21529)
@@ -0,0 +1,25 @@
+From 6e0c0e2e1d3fd1284b4c002c04898dc5da6cf859 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Thu, 18 Jul 2013 17:46:39 +0200
+Subject: [PATCH] manage previous site package
+
+this is to support the transition between an unversiond installation tree
+---
+ Lib/site.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Lib/site.py b/Lib/site.py
+index f1b0ae8..ebe09e3 100644
+--- a/Lib/site.py
++++ b/Lib/site.py
+@@ -292,6 +292,7 @@ def getsitepackages():
+ "python" + sys.version[:3],
+ "site-packages"))
+ sitepackages.append(os.path.join(prefix, "lib", "site-python"))
++ sitepackages.append(os.path.join(prefix, "lib", "python"))
+ else:
+ sitepackages.append(prefix)
+ sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
+--
+1.8.3.1
+
Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-setup.patch
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-setup.patch 2013-07-18 15:20:11 UTC (rev 21528)
+++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0001-setup.patch 2013-07-19 07:37:08 UTC (rev 21529)
@@ -1,111 +0,0 @@
-From d2205faf194d7cc3adfc11a0f8f58e6e75f4da7a Mon Sep 17 00:00:00 2001
-From: Peter Felecan <pfelecan at opencsw.org>
-Date: Mon, 15 Jul 2013 11:43:50 +0200
-Subject: [PATCH] setup
-
-based on the 2.6 site.diff with adaptations
----
- setup.py | 36 ++++++++++++++++++++++--------------
- 1 file changed, 22 insertions(+), 14 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 716f08e..fc58444 100644
---- a/setup.py
-+++ b/setup.py
-@@ -436,9 +436,9 @@ class PyBuildExt(build_ext):
- os.unlink(tmpfile)
-
- 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')
- self.add_gcc_paths()
- self.add_multiarch_paths()
-
-@@ -783,7 +783,7 @@ class PyBuildExt(build_ext):
- libraries=math_libs) )
- # Detect SSL support for the socket module (via _ssl)
- search_for_ssl_incs_in = [
-- '/usr/local/ssl/include',
-+ '/opt/csw/ssl/include',
- '/usr/contrib/ssl/include/'
- ]
- ssl_incs = find_file('openssl/ssl.h', inc_dirs,
-@@ -795,7 +795,7 @@ class PyBuildExt(build_ext):
- if krb5_h:
- ssl_incs += krb5_h
- ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
-- ['/usr/local/ssl/lib',
-+ ['/opt/csw/ssl/lib',
- '/usr/contrib/ssl/lib/'
- ] )
-
-@@ -920,10 +920,10 @@ class PyBuildExt(build_ext):
- # top of the normal inc_dirs.
- db_inc_paths = [
- '/usr/include/db4',
-- '/usr/local/include/db4',
-+ '/opt/csw/include/db4',
- '/opt/sfw/include/db4',
- '/usr/include/db3',
-- '/usr/local/include/db3',
-+ '/opt/csw/include/db3',
- '/opt/sfw/include/db3',
- # Fink defaults (http://fink.sourceforge.net/)
- '/sw/include/db4',
-@@ -933,8 +933,8 @@ class PyBuildExt(build_ext):
- 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('/opt/csw/BerkeleyDB.4.%d/include' % x)
-+ db_inc_paths.append('/opt/csw/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/)
-@@ -942,8 +942,8 @@ class PyBuildExt(build_ext):
- # 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('/opt/csw/BerkeleyDB.3.%d/include' % x)
-+ db_inc_paths.append('/opt/csw/include/db3%d' % x)
- db_inc_paths.append('/pkg/db-3.%d/include' % x)
- db_inc_paths.append('/opt/db-3.%d/include' % x)
-
-@@ -1094,9 +1094,9 @@ class PyBuildExt(build_ext):
- sqlite_inc_paths = [ '/usr/include',
- '/usr/include/sqlite',
- '/usr/include/sqlite3',
-- '/usr/local/include',
-- '/usr/local/include/sqlite',
-- '/usr/local/include/sqlite3',
-+ '/opt/csw/include',
-+ '/opt/csw/include/sqlite',
-+ '/opt/csw/include/sqlite3',
- ]
- if cross_compiling:
- sqlite_inc_paths = []
-@@ -1555,6 +1555,14 @@ class PyBuildExt(build_ext):
- macros = dict()
- libraries = []
-
-+ elif host_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()
- libraries = ['rt']
---
-1.8.3.1
-
Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0002-faqwiz.patch
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0002-faqwiz.patch 2013-07-18 15:20:11 UTC (rev 21528)
+++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0002-faqwiz.patch 2013-07-19 07:37:08 UTC (rev 21529)
@@ -1,26 +0,0 @@
-From 0dc3e5cd576a09af3d88a00c473291b7c2cb0d3f Mon Sep 17 00:00:00 2001
-From: Peter Felecan <pfelecan at opencsw.org>
-Date: Mon, 15 Jul 2013 12:58:31 +0200
-Subject: [PATCH] faqwiz
-
-based on faqwiz.diff from 2.6
----
- Tools/faqwiz/faqconf.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Tools/faqwiz/faqconf.py b/Tools/faqwiz/faqconf.py
-index d1acd80..05d060a 100644
---- a/Tools/faqwiz/faqconf.py
-+++ b/Tools/faqwiz/faqconf.py
-@@ -21,7 +21,7 @@ OWNERNAME = "FAQ owner" # Name for feedback
- OWNEREMAIL = "nobody at 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
---
-1.8.3.1
-
Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0003-makesetup.patch
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0003-makesetup.patch 2013-07-18 15:20:11 UTC (rev 21528)
+++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0003-makesetup.patch 2013-07-19 07:37:08 UTC (rev 21529)
@@ -1,35 +0,0 @@
-From 337c51f7a5c0f68561d415aefc7ba889a3897a13 Mon Sep 17 00:00:00 2001
-From: Peter Felecan <pfelecan at opencsw.org>
-Date: Mon, 15 Jul 2013 13:49:06 +0200
-Subject: [PATCH] makesetup
-
-based on makesetup from 2.6
----
- Modules/makesetup | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/Modules/makesetup b/Modules/makesetup
-index 8862c36..c28e3a8 100755
---- a/Modules/makesetup
-+++ b/Modules/makesetup
-@@ -214,10 +214,15 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' |
- 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
---
-1.8.3.1
-
Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0004-modules.patch
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0004-modules.patch 2013-07-18 15:20:11 UTC (rev 21528)
+++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0004-modules.patch 2013-07-19 07:37:08 UTC (rev 21529)
@@ -1,30 +0,0 @@
-From 74b002eee8ef49739c50073c20233dab2bacc25b Mon Sep 17 00:00:00 2001
-From: Peter Felecan <pfelecan at opencsw.org>
-Date: Mon, 15 Jul 2013 14:05:03 +0200
-Subject: [PATCH] modules
-
-based on modules.diff from 2.6
----
- Modules/Setup.dist | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Modules/Setup.dist b/Modules/Setup.dist
-index 2ad1aa3..04f7bc1 100644
---- a/Modules/Setup.dist
-+++ b/Modules/Setup.dist
-@@ -367,9 +367,10 @@ GLHACK=-Dclear=__GLclear
- #
- # First, look at Setup.config; configure may have set this for you.
-
--#_curses _cursesmodule.c -lcurses -ltermcap
-+*shared*
-+_curses _cursesmodule.c -R/opt/csw/lib -L/opt/csw/lib -lcurses -lncursesw -lxtermcap
- # 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 -R/opt/csw/lib -L/opt/csw/lib -lcurses -lpanel -lncursesw -lxtermcap
-
-
- # Generic (SunOS / SVR4) dynamic loading module.
---
-1.8.3.1
-
Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0005-multiprocess.patch
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0005-multiprocess.patch 2013-07-18 15:20:11 UTC (rev 21528)
+++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0005-multiprocess.patch 2013-07-19 07:37:08 UTC (rev 21529)
@@ -1,56 +0,0 @@
-From b4da8e66d1a74bad609e0b6f585670a4180d0bb0 Mon Sep 17 00:00:00 2001
-From: Peter Felecan <pfelecan at opencsw.org>
-Date: Mon, 15 Jul 2013 14:16:24 +0200
-Subject: [PATCH] multiprocess
-
-based on multiprocess.diff from 2.6
----
- Modules/_multiprocessing/multiprocessing.h | 25 +++++++++++++++++++++++++
- 1 file changed, 25 insertions(+)
-
-diff --git a/Modules/_multiprocessing/multiprocessing.h b/Modules/_multiprocessing/multiprocessing.h
-index 14425de..c9fd187 100644
---- a/Modules/_multiprocessing/multiprocessing.h
-+++ b/Modules/_multiprocessing/multiprocessing.h
-@@ -48,6 +48,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
-@@ -64,6 +78,17 @@
-
-
- /*
-+ * 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
- */
-
---
-1.8.3.1
-
Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0006-python-config-in.patch
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0006-python-config-in.patch 2013-07-18 15:20:11 UTC (rev 21528)
+++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0006-python-config-in.patch 2013-07-19 07:37:08 UTC (rev 21529)
@@ -1,24 +0,0 @@
-From 220ff3d78b11ae5e1f00c42f20b77d8898156ca1 Mon Sep 17 00:00:00 2001
-From: Peter Felecan <pfelecan at opencsw.org>
-Date: Mon, 15 Jul 2013 14:41:26 +0200
-Subject: [PATCH] python config in
-
-based on python-config-in.diff from 2.6 with adaptations
----
- Misc/python-config.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Misc/python-config.in b/Misc/python-config.in
-index ca9857a..40d5357 100644
---- a/Misc/python-config.in
-+++ b/Misc/python-config.in
-@@ -53,5 +53,6 @@ for opt in opt_flags:
- libs.insert(0, '-L' + getvar('LIBPL'))
- if not getvar('PYTHONFRAMEWORK'):
- libs.extend(getvar('LINKFORSHARED').split())
-+ libs.insert(0, '-R/opt/csw/lib/$ISALIST -L/opt/csw/lib')
- print ' '.join(libs)
-
---
-1.8.3.1
-
Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0007-pyport.patch
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0007-pyport.patch 2013-07-18 15:20:11 UTC (rev 21528)
+++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0007-pyport.patch 2013-07-19 07:37:08 UTC (rev 21529)
@@ -1,29 +0,0 @@
-From 9a42a63a00b689fa655a0b9323b72eade67e0de9 Mon Sep 17 00:00:00 2001
-From: Peter Felecan <pfelecan at opencsw.org>
-Date: Mon, 15 Jul 2013 14:51:36 +0200
-Subject: [PATCH] pyport
-
-based on pyport.diff from 2.6
----
- Include/pyport.h | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/Include/pyport.h b/Include/pyport.h
-index 85e852f..c1fea29 100644
---- a/Include/pyport.h
-+++ b/Include/pyport.h
-@@ -640,11 +640,6 @@ Please be conservative with adding new ones, document them and enclose them
- 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] */
---
-1.8.3.1
-
Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0008-site.patch
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0008-site.patch 2013-07-18 15:20:11 UTC (rev 21528)
+++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/0008-site.patch 2013-07-19 07:37:08 UTC (rev 21529)
@@ -1,161 +0,0 @@
-From aba7368c957a565f1f2b3770aaef3fe950816a1b Mon Sep 17 00:00:00 2001
-From: Peter Felecan <pfelecan at opencsw.org>
-Date: Tue, 16 Jul 2013 16:59:44 +0200
-Subject: [PATCH] site
-
-based on site.diff from 2.6 with adaptations
----
- Lib/distutils/sysconfig.py | 2 +-
- Lib/site.py | 2 +-
- Lib/sysconfig.py | 32 ++++++++++++++++----------------
- Lib/trace.py | 4 ++--
- Makefile.pre.in | 6 +++---
- Modules/getpath.c | 6 +++---
- 6 files changed, 26 insertions(+), 26 deletions(-)
-
-diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
-index 0c726d9..a9ada72 100644
---- a/Lib/distutils/sysconfig.py
-+++ b/Lib/distutils/sysconfig.py
-@@ -120,7 +120,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
-
- if os.name == "posix":
- libpython = os.path.join(prefix,
-- "lib", "python" + get_python_version())
-+ "lib", "python")
- if standard_lib:
- return libpython
- else:
-diff --git a/Lib/site.py b/Lib/site.py
-index f1b0ae8..be21919 100644
---- a/Lib/site.py
-+++ b/Lib/site.py
-@@ -289,7 +289,7 @@ def getsitepackages():
- sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
- elif os.sep == '/':
- sitepackages.append(os.path.join(prefix, "lib",
-- "python" + sys.version[:3],
-+ "python",
- "site-packages"))
- sitepackages.append(os.path.join(prefix, "lib", "site-python"))
- else:
-diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
-index aa69351..b177b61 100644
---- a/Lib/sysconfig.py
-+++ b/Lib/sysconfig.py
-@@ -7,12 +7,12 @@ from os.path import pardir, realpath
-
- _INSTALL_SCHEMES = {
- 'posix_prefix': {
-- 'stdlib': '{base}/lib/python{py_version_short}',
-- 'platstdlib': '{platbase}/lib/python{py_version_short}',
-- 'purelib': '{base}/lib/python{py_version_short}/site-packages',
-- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
-- 'include': '{base}/include/python{py_version_short}',
-- 'platinclude': '{platbase}/include/python{py_version_short}',
-+ 'stdlib': '{base}/lib/python',
-+ 'platstdlib': '{platbase}/lib/python',
-+ 'purelib': '{base}/lib/python/site-packages',
-+ 'platlib': '{platbase}/lib/python/site-packages',
-+ 'include': '{base}/include/python',
-+ 'platinclude': '{platbase}/include/python',
- 'scripts': '{base}/bin',
- 'data': '{base}',
- },
-@@ -47,11 +47,11 @@ _INSTALL_SCHEMES = {
- 'data' : '{base}',
- },
- 'os2_home': {
-- 'stdlib': '{userbase}/lib/python{py_version_short}',
-- 'platstdlib': '{userbase}/lib/python{py_version_short}',
-- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
-- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
-- 'include': '{userbase}/include/python{py_version_short}',
-+ 'stdlib': '{userbase}/lib/python',
-+ 'platstdlib': '{userbase}/lib/python',
-+ 'purelib': '{userbase}/lib/python/site-packages',
-+ 'platlib': '{userbase}/lib/python/site-packages',
-+ 'include': '{userbase}/include/python',
- 'scripts': '{userbase}/bin',
- 'data' : '{userbase}',
- },
-@@ -65,11 +65,11 @@ _INSTALL_SCHEMES = {
- 'data' : '{userbase}',
- },
- 'posix_user': {
-- 'stdlib': '{userbase}/lib/python{py_version_short}',
-- 'platstdlib': '{userbase}/lib/python{py_version_short}',
-- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
-- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
-- 'include': '{userbase}/include/python{py_version_short}',
-+ 'stdlib': '{userbase}/lib/python',
-+ 'platstdlib': '{userbase}/lib/python',
-+ 'purelib': '{userbase}/lib/python/site-packages',
-+ 'platlib': '{userbase}/lib/python/site-packages',
-+ 'include': '{userbase}/include/python',
- 'scripts': '{userbase}/bin',
- 'data' : '{userbase}',
- },
-diff --git a/Lib/trace.py b/Lib/trace.py
-index 38a13e2..a54e9e7 100644
---- a/Lib/trace.py
-+++ b/Lib/trace.py
-@@ -755,10 +755,10 @@ def main(argv=None):
-
- s = s.replace("$prefix",
- os.path.join(sys.prefix, "lib",
-- "python" + sys.version[:3]))
-+ "python"))
- s = s.replace("$exec_prefix",
- os.path.join(sys.exec_prefix, "lib",
-- "python" + sys.version[:3]))
-+ "python"))
- s = os.path.normpath(s)
- ignore_dirs.append(s)
- continue
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 9d55550..b723a50 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -109,11 +109,11 @@ CONFINCLUDEDIR= $(exec_prefix)/include
- SCRIPTDIR= $(prefix)/lib
-
- # Detailed destination directories
--BINLIBDEST= $(LIBDIR)/python$(VERSION)
--LIBDEST= $(SCRIPTDIR)/python$(VERSION)
-+BINLIBDEST= $(LIBDIR)/python
-+LIBDEST= $(SCRIPTDIR)/python
- INCLUDEPY= $(INCLUDEDIR)/python$(VERSION)
- CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION)
--LIBP= $(LIBDIR)/python$(VERSION)
-+LIBP= $(LIBDIR)/python
-
- # Symbols used for using shared libraries
- SO= @SO@
-diff --git a/Modules/getpath.c b/Modules/getpath.c
-index de96d47..9a88383 100644
---- a/Modules/getpath.c
-+++ b/Modules/getpath.c
-@@ -117,8 +117,8 @@
- #endif
-
- #ifndef PYTHONPATH
--#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
-- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
-+#define PYTHONPATH PREFIX "/lib/python:" \
-+ EXEC_PREFIX "/lib/python/lib-dynload"
- #endif
-
- #ifndef LANDMARK
-@@ -129,7 +129,7 @@ static char prefix[MAXPATHLEN+1];
- static char exec_prefix[MAXPATHLEN+1];
- static char progpath[MAXPATHLEN+1];
- static char *module_search_path = NULL;
--static char lib_python[] = "lib/python" VERSION;
-+static char lib_python[] = "lib/python";
-
- static void
- reduce(char *dir)
---
-1.8.3.1
-
Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/getpass.patch
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/getpass.patch 2013-07-18 15:20:11 UTC (rev 21528)
+++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/getpass.patch 2013-07-19 07:37:08 UTC (rev 21529)
@@ -1,30 +0,0 @@
---- release26-maint/Lib/getpass.py 2009/11/01 16:17:0676014
-+++ release26-maint/Lib/getpass.py 2009/11/01 18:31:1376015
-@@ -62,12 +62,16 @@
- try:
- old = termios.tcgetattr(fd) # a copy to save
- new = old[:]
-- new[3] &= ~termios.ECHO # 3 == 'lflags'
-+ new[3] &= ~(termios.ECHO|termios.ISIG) # 3 == 'lflags'
-+ tcsetattr_flags = termios.TCSAFLUSH
-+ if hasattr(termios, 'TCSASOFT'):
-+ tcsetattr_flags |= termios.TCSASOFT
- try:
-- termios.tcsetattr(fd, termios.TCSADRAIN, new)
-+ termios.tcsetattr(fd, tcsetattr_flags, new)
- passwd = _raw_input(prompt, stream, input=input)
- finally:
-- termios.tcsetattr(fd, termios.TCSADRAIN, old)
-+ termios.tcsetattr(fd, tcsetattr_flags, old)
-+ stream.flush() # issue7208
- except termios.error, e:
- if passwd is not None:
- # _raw_input succeeded. The final tcsetattr failed. Reraise
-@@ -125,6 +129,7 @@
- if prompt:
- stream.write(prompt)
- stream.flush()
-+ # NOTE: The Python C API calls flockfile() (and unlock) during readline.
- line = input.readline()
- if not line:
- raise EOFError
Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/patch_2.diff.txt
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/patch_2.diff.txt 2013-07-18 15:20:11 UTC (rev 21528)
+++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/patch_2.diff.txt 2013-07-19 07:37:08 UTC (rev 21529)
@@ -1,63 +0,0 @@
-diff -ur Python-2.6.4/Modules/posixmodule.c Python-2.6.4.patched/Modules/posixmodule.c
---- Python-2.6.4/Modules/posixmodule.c 2009-09-16 16:06:36.000000000 -0400
-+++ Python-2.6.4.patched/Modules/posixmodule.c 2010-01-22 10:00:18.000000000 -0500
-@@ -3634,11 +3634,12 @@
- int result;
- _PyImport_AcquireLock();
- pid = fork1();
-+ if (pid == 0)
-+ PyOS_AfterFork();
-+
- result = _PyImport_ReleaseLock();
- if (pid == -1)
- return posix_error();
-- if (pid == 0)
-- PyOS_AfterFork();
- if (result < 0) {
- /* Don't clobber the OSError if the fork failed. */
- PyErr_SetString(PyExc_RuntimeError,
-@@ -3663,11 +3664,12 @@
- int result;
- _PyImport_AcquireLock();
- pid = fork();
-+ if (pid == 0)
-+ PyOS_AfterFork();
-+
- result = _PyImport_ReleaseLock();
- if (pid == -1)
- return posix_error();
-- if (pid == 0)
-- PyOS_AfterFork();
- if (result < 0) {
- /* Don't clobber the OSError if the fork failed. */
- PyErr_SetString(PyExc_RuntimeError,
-@@ -3781,11 +3783,12 @@
-
- _PyImport_AcquireLock();
- pid = forkpty(&master_fd, NULL, NULL, NULL);
-+ if (pid == 0)
-+ PyOS_AfterFork();
-+
- result = _PyImport_ReleaseLock();
- if (pid == -1)
- return posix_error();
-- if (pid == 0)
-- PyOS_AfterFork();
- if (result < 0) {
- /* Don't clobber the OSError if the fork failed. */
- PyErr_SetString(PyExc_RuntimeError,
-diff -ur Python-2.6.4/Python/import.c Python-2.6.4.patched/Python/import.c
---- Python-2.6.4/Python/import.c 2009-09-16 16:06:36.000000000 -0400
-+++ Python-2.6.4.patched/Python/import.c 2010-01-26 07:03:14.000000000 -0500
-@@ -303,10 +303,9 @@
- void
- _PyImport_ReInitLock(void)
- {
--#ifdef _AIX
- if (import_lock != NULL)
- import_lock = PyThread_allocate_lock();
--#endif
-+ import_lock_thread = PyThread_get_thread_ident();
- }
-
- #endif
Deleted: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/site.diff
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/site.diff 2013-07-18 15:20:11 UTC (rev 21528)
+++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/site.diff 2013-07-19 07:37:08 UTC (rev 21529)
@@ -1,77 +0,0 @@
---- Python-2.6.2/Lib/site.py.o 2009-05-16 10:26:13.235499624 -0500
-+++ Python-2.6.2/Lib/site.py 2009-05-16 10:29:16.772710013 -0500
-@@ -266,9 +266,10 @@
- sitedirs.append(os.path.join(prefix, "Lib", "site-packages"))
- elif os.sep == '/':
- sitedirs.append(os.path.join(prefix, "lib",
-- "python" + sys.version[:3],
-+ "python",
- "site-packages"))
- sitedirs.append(os.path.join(prefix, "lib", "site-python"))
-+ sitedirs.append("/opt/csw/lib/python2.3/site-packages")
- else:
- sitedirs.append(prefix)
- sitedirs.append(os.path.join(prefix, "lib", "site-packages"))
---- Python-2.6.2/Lib/distutils/command/install.py.o 2009-05-16 10:29:46.625564211 -0500
-+++ Python-2.6.2/Lib/distutils/command/install.py 2009-05-16 10:31:26.296866583 -0500
-@@ -41,8 +41,8 @@
-
- INSTALL_SCHEMES = {
- 'unix_prefix': {
-- 'purelib': '$base/lib/python$py_version_short/site-packages',
-- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
-+ 'purelib': '$base/lib/python/site-packages',
-+ 'platlib': '$platbase/lib/python/site-packages',
- 'headers': '$base/include/python$py_version_short/$dist_name',
- 'scripts': '$base/bin',
- 'data' : '$base',
---- Python-2.6.2/Makefile.pre.in.o 2009-05-16 10:35:14.566752156 -0500
-+++ Python-2.6.2/Makefile.pre.in 2009-05-16 10:35:55.162080324 -0500
-@@ -94,11 +94,11 @@
- SCRIPTDIR= $(prefix)/lib
-
- # Detailed destination directories
--BINLIBDEST= $(LIBDIR)/python$(VERSION)
--LIBDEST= $(SCRIPTDIR)/python$(VERSION)
-+BINLIBDEST= $(LIBDIR)/python
-+LIBDEST= $(SCRIPTDIR)/python
- INCLUDEPY= $(INCLUDEDIR)/python$(VERSION)
- CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION)
--LIBP= $(LIBDIR)/python$(VERSION)
-+LIBP= $(LIBDIR)/python
-
- # Symbols used for using shared libraries
- SO= @SO@
---- Python-2.6.2/Modules/getpath.c.o 2009-05-16 10:44:29.756720713 -0500
-+++ Python-2.6.2/Modules/getpath.c 2009-05-16 10:45:33.735370122 -0500
-@@ -117,8 +117,8 @@
- #endif
-
- #ifndef PYTHONPATH
--#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
-- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
-+#define PYTHONPATH PREFIX "/lib/python:" \
-+ EXEC_PREFIX "/lib/python/lib-dynload"
- #endif
-
- #ifndef LANDMARK
-@@ -129,7 +129,7 @@
- static char exec_prefix[MAXPATHLEN+1];
- static char progpath[MAXPATHLEN+1];
- static char *module_search_path = NULL;
--static char lib_python[] = "lib/python" VERSION;
-+static char lib_python[] = "lib/python";
-
- static void
- reduce(char *dir)
---- Python-2.6.2/Lib/distutils/sysconfig.py.o 2009-05-16 10:48:24.271739485 -0500
-+++ Python-2.6.2/Lib/distutils/sysconfig.py 2009-05-16 10:49:21.413202445 -0500
-@@ -116,7 +116,7 @@
-
- if os.name == "posix":
- libpython = os.path.join(prefix,
-- "lib", "python" + get_python_version())
-+ "lib", "python")
- if standard_lib:
- return libpython
- else:
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