[csw-devel] SF.net SVN: gar:[19477] csw/mgar/pkg/lang-python/python/branches/ bw-libdir-fix-2.6
bdwalton at users.sourceforge.net
bdwalton at users.sourceforge.net
Sun Oct 21 13:47:43 CEST 2012
Revision: 19477
http://gar.svn.sourceforge.net/gar/?rev=19477&view=rev
Author: bdwalton
Date: 2012-10-21 11:47:43 +0000 (Sun, 21 Oct 2012)
Log Message:
-----------
lang-python/python/branches/bw-libdir-fix-2.6: update legacy patch stack: legacy sol8 stuff dropped, library path not munged, a few other legacy things dropped
Modified Paths:
--------------
csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile
Added Paths:
-----------
csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0001-patch-a-usr-local-reference-to-opt-csw-in-Tools-faqw.patch
csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0002-handle-special-options-for-bsddb-in-Modules-makesetu.patch
csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0003-bash-in-some-linker-options-for-the-curses-module.-m.patch
csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0004-hack-some-solaris-requirements-into-setup.py.patch
csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0005-ensure-the-_socket-module-links-with-the-socket-libr.patch
csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0006-ensure-the-_multiprocessing-module-links-with-the-so.patch
Modified: csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile 2012-10-20 18:06:57 UTC (rev 19476)
+++ csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile 2012-10-21 11:47:43 UTC (rev 19477)
@@ -50,14 +50,13 @@
PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
# Patches
-PATCHFILES += faqwiz.diff
-PATCHFILES += makesetup.diff
-PATCHFILES += modules.diff
-PATCHFILES += multiprocess.diff
-PATCHFILES += pyport.diff
-PATCHFILES += site.diff
-PATCHFILES += python-config-in.diff
-PATCHFILES += setup.diff
+PATCHFILES += 0001-patch-a-usr-local-reference-to-opt-csw-in-Tools-faqw.patch
+PATCHFILES += 0002-handle-special-options-for-bsddb-in-Modules-makesetu.patch
+PATCHFILES += 0003-bash-in-some-linker-options-for-the-curses-module.-m.patch
+PATCHFILES += 0004-hack-some-solaris-requirements-into-setup.py.patch
+PATCHFILES += 0005-ensure-the-_socket-module-links-with-the-socket-libr.patch
+PATCHFILES += 0006-ensure-the-_multiprocessing-module-links-with-the-so.patch
+
PATCHFILES += 0001-FFI_DEFAULT_ABI-to-use-__i386.patch
# PATCHFILES += 0010-Hardcoding-the-use-of-libffi.patch
# PATCHFILES += 0011-OpenCSW-specific-libffi-include-dir.patch
Added: csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0001-patch-a-usr-local-reference-to-opt-csw-in-Tools-faqw.patch
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0001-patch-a-usr-local-reference-to-opt-csw-in-Tools-faqw.patch (rev 0)
+++ csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0001-patch-a-usr-local-reference-to-opt-csw-in-Tools-faqw.patch 2012-10-21 11:47:43 UTC (rev 19477)
@@ -0,0 +1,26 @@
+From 1095f75f9f11f41bf24e391bb755abaaea0afbec Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sat, 20 Oct 2012 20:20:50 +0200
+Subject: [PATCH 1/4] patch a usr/local reference to opt/csw in Tools/faqwiz
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ 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.7.12
+
Added: csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0002-handle-special-options-for-bsddb-in-Modules-makesetu.patch
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0002-handle-special-options-for-bsddb-in-Modules-makesetu.patch (rev 0)
+++ csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0002-handle-special-options-for-bsddb-in-Modules-makesetu.patch 2012-10-21 11:47:43 UTC (rev 19477)
@@ -0,0 +1,31 @@
+From 78113a4bbf99d0ca8c9d19721aeeb3a1f187489e Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sat, 20 Oct 2012 20:24:36 +0200
+Subject: [PATCH 2/4] handle special options for bsddb in Modules/makesetup
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ Modules/makesetup | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Modules/makesetup b/Modules/makesetup
+index 8862c36..6883bca 100755
+--- a/Modules/makesetup
++++ b/Modules/makesetup
+@@ -217,7 +217,12 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' |
+ *) 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.7.12
+
Added: csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0003-bash-in-some-linker-options-for-the-curses-module.-m.patch
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0003-bash-in-some-linker-options-for-the-curses-module.-m.patch (rev 0)
+++ csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0003-bash-in-some-linker-options-for-the-curses-module.-m.patch 2012-10-21 11:47:43 UTC (rev 19477)
@@ -0,0 +1,31 @@
+From b27a1f6efaf775a01067fbe4a9bf572b90b7fad9 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sat, 20 Oct 2012 20:26:14 +0200
+Subject: [PATCH 3/4] bash in some linker options for the curses module. (may
+ not be necessary now?)
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ Modules/Setup.dist | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Modules/Setup.dist b/Modules/Setup.dist
+index 5e69a60..d95669b 100644
+--- a/Modules/Setup.dist
++++ b/Modules/Setup.dist
+@@ -363,9 +363,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.7.12
+
Added: csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0004-hack-some-solaris-requirements-into-setup.py.patch
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0004-hack-some-solaris-requirements-into-setup.py.patch (rev 0)
+++ csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0004-hack-some-solaris-requirements-into-setup.py.patch 2012-10-21 11:47:43 UTC (rev 19477)
@@ -0,0 +1,45 @@
+From aeb403c7a7b33c3fd6a63dcbfa24b3d314885c29 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sat, 20 Oct 2012 22:01:07 +0200
+Subject: [PATCH 4/4] hack some solaris requirements into setup.py
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ setup.py | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 4fe1f45..d7b6b07 100644
+--- a/setup.py
++++ b/setup.py
+@@ -355,9 +355,9 @@ class PyBuildExt(build_ext):
+ 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.
+@@ -1408,6 +1408,14 @@ class PyBuildExt(build_ext):
+ )
+ 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,
+--
+1.7.12
+
Added: csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0005-ensure-the-_socket-module-links-with-the-socket-libr.patch
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0005-ensure-the-_socket-module-links-with-the-socket-libr.patch (rev 0)
+++ csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0005-ensure-the-_socket-module-links-with-the-socket-libr.patch 2012-10-21 11:47:43 UTC (rev 19477)
@@ -0,0 +1,25 @@
+From f13b4bdaf5352bf57a6f265b2efea648ae3dba26 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sun, 21 Oct 2012 13:19:32 +0200
+Subject: [PATCH] ensure the _socket module links with the socket library
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ setup.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/setup.py b/setup.py
+index 3d7ce83..b292a0e 100644
+--- a/setup.py
++++ b/setup.py
+@@ -688,6 +688,7 @@ class PyBuildExt(build_ext):
+
+ # socket(2)
+ exts.append( Extension('_socket', ['socketmodule.c'],
++ libraries = ['socket'],
+ depends = ['socketmodule.h']) )
+ # Detect SSL support for the socket module (via _ssl)
+ search_for_ssl_incs_in = [
+--
+1.7.12
+
Added: csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0006-ensure-the-_multiprocessing-module-links-with-the-so.patch
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0006-ensure-the-_multiprocessing-module-links-with-the-so.patch (rev 0)
+++ csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0006-ensure-the-_multiprocessing-module-links-with-the-so.patch 2012-10-21 11:47:43 UTC (rev 19477)
@@ -0,0 +1,26 @@
+From 16328d74227516e110c459ad3eb54c813176fb37 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sun, 21 Oct 2012 13:24:14 +0200
+Subject: [PATCH] ensure the _multiprocessing module links with the socket
+ library
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ setup.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/setup.py b/setup.py
+index b292a0e..eb4b354 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1444,6 +1444,7 @@ class PyBuildExt(build_ext):
+ if sysconfig.get_config_var('WITH_THREAD'):
+ exts.append ( Extension('_multiprocessing', multiprocessing_srcs,
+ define_macros=macros.items(),
++ libraries = ['socket'],
+ include_dirs=["Modules/_multiprocessing"]))
+ else:
+ missing.append('_multiprocessing')
+--
+1.7.12
+
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