[csw-devel] SF.net SVN: gar:[20121] csw/mgar/pkg/lang-python/python/branches/python-3.3

[wahwah at users.sourceforge.net]

Revision: 20121
          http://gar.svn.sourceforge.net/gar/?rev=20121&view=rev
Author:   wahwah
Date:     2013-01-13 20:38:43 +0000 (Sun, 13 Jan 2013)
Log Message:
-----------
lang-python/python/branches/python-3.3: restore some changes from setup.diff

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile

Added Paths:
-----------
    csw/mgar/pkg/lang-python/python/branches/python-3.3/files/0005-Use-opt-csw-lib-for-module-search.patch
    csw/mgar/pkg/lang-python/python/branches/python-3.3/files/0007-Settings-for-Solaris.patch

Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile	2013-01-13 20:35:03 UTC (rev 20120)
+++ csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile	2013-01-13 20:38:43 UTC (rev 20121)
@@ -40,6 +40,8 @@
 PATCHFILES += modules.diff
 PATCHFILES += multiprocess.diff
 PATCHFILES += 0004-Use-PY_CPPFLAGS-in-Modules-makesetup.patch
+PATCHFILES += 0005-Use-opt-csw-lib-for-module-search.patch
+PATCHFILES += 0007-Settings-for-Solaris.patch
 
 # The test for sunaudiodev fails.  Not that it's a good practice to skip
 # tests.

Added: csw/mgar/pkg/lang-python/python/branches/python-3.3/files/0005-Use-opt-csw-lib-for-module-search.patch
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-3.3/files/0005-Use-opt-csw-lib-for-module-search.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-python/python/branches/python-3.3/files/0005-Use-opt-csw-lib-for-module-search.patch	2013-01-13 20:38:43 UTC (rev 20121)
@@ -0,0 +1,25 @@
+From c133e1a6a5d984f1b010470f5f6fbc3ea53d7ac1 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sun, 13 Jan 2013 20:59:47 +0100
+Subject: [PATCH] Use /opt/csw/lib for module search
+
+---
+ setup.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/setup.py b/setup.py
+index 9ddf2e9..e7e262b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -459,6 +459,8 @@ class PyBuildExt(build_ext):
+         # directories (i.e. '.' and 'Include') must be first.  See issue
+         # 10520.
+         if not cross_compiling:
++            add_dir_to_list(self.compiler.library_dirs, '/opt/csw/lib')
++            add_dir_to_list(self.compiler.include_dirs, '/opt/csw/include')
+             add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+             add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+         # only change this for cross builds for 3.3, issues on Mageia
+-- 
+1.8.0
+

Added: csw/mgar/pkg/lang-python/python/branches/python-3.3/files/0007-Settings-for-Solaris.patch
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-3.3/files/0007-Settings-for-Solaris.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-python/python/branches/python-3.3/files/0007-Settings-for-Solaris.patch	2013-01-13 20:38:43 UTC (rev 20121)
@@ -0,0 +1,31 @@
+From 14a318b3e2fb0ccb3792e65ef4f0b361384ddaea Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sun, 13 Jan 2013 21:24:23 +0100
+Subject: [PATCH 7/7] Settings for Solaris
+
+---
+ setup.py | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/setup.py b/setup.py
+index e7e262b..62f72cd 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1478,6 +1478,14 @@ class PyBuildExt(build_ext):
+             macros = dict()
+             libraries = []
+ 
++        elif platform == 'sunos5':      # Solaris
++            macros = dict(
++                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.0
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.