[csw-devel] SF.net SVN: gar:[21533] csw/mgar/pkg/lang-python/python/trunk

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Mon Jul 22 10:13:34 CEST 2013 

Revision: 21533
          http://gar.svn.sourceforge.net/gar/?rev=21533&view=rev
Author:   wahwah
Date:     2013-07-22 08:13:19 +0000 (Mon, 22 Jul 2013)
Log Message:
-----------
lang-python/python/trunk: Switch to the 2.6 versioned directory. Support modules in the unversioned one.

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/python/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/lang-python/python/trunk/files/0015-Look-for-modules-in-the-unversioned-directory.patch

Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/python/trunk/Makefile	2013-07-21 11:39:42 UTC (rev 21532)
+++ csw/mgar/pkg/lang-python/python/trunk/Makefile	2013-07-22 08:13:19 UTC (rev 21533)
@@ -51,7 +51,10 @@
 # change this you have to rebuild the whole Python world.
 #
 # I really hope we never ever do this again.
-PATCHFILES += site.diff
+# PATCHFILES += site.diff
+#
+# Let's try to break free:
+PATCHFILES += 0015-Look-for-modules-in-the-unversioned-directory.patch
 
 PATCHFILES += python-config-in.diff
 PATCHFILES += setup.diff
@@ -102,6 +105,15 @@
 CHECKPKG_OVERRIDES_CSWpython += soname-unused|libssl.so.1.0.0|is|needed|by|/opt/csw/lib/python/lib-dynload/_hashlib.so|but|never|used
 CHECKPKG_OVERRIDES_CSWpython += no-direct-binding|/opt/csw/lib/python/lib-dynload/_hashlib.so|is|not|directly|bound|to|soname|libssl.so.1.0.0
 
+# With the versioned directory:
+CHECKPKG_OVERRIDES_CSWpython-tk += soname-unused|libX11.so.4|is|needed|by|/opt/csw/lib/python2.6/lib-dynload/_tkinter.so|but|never|used
+CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/test/test_subprocess.py
+CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/test/test_posixpath.py
+CHECKPKG_OVERRIDES_CSWpython += soname-unused|libcurses.so.1|is|needed|by|/opt/csw/lib/python2.6/lib-dynload/_curses_panel.so|but|never|used
+CHECKPKG_OVERRIDES_CSWpython += soname-unused|libncursesw.so.5|is|needed|by|/opt/csw/lib/python2.6/lib-dynload/_curses_panel.so|but|never|used
+CHECKPKG_OVERRIDES_CSWpython += soname-unused|libssl.so.1.0.0|is|needed|by|/opt/csw/lib/python2.6/lib-dynload/_hashlib.so|but|never|used
+
+
 NOISALIST = 1
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared
@@ -167,31 +179,41 @@
 RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk    += CSWpython$(CVER)
 
 # Don't merge test files.
-EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/test
-EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/test/.*
-EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/bsddb/test.*
-EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/ctypes/test.*
-EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/email/test.*
-EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/distutils/tests.*
-EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/json/tests.*
-EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/lib2to3/tests.*
-EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/sqlite3/test.*
-EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/unittest/test.*
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/test
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/test/.*
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/bsddb/test.*
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/ctypes/test.*
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/email/test.*
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/distutils/tests.*
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/json/tests.*
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/lib2to3/tests.*
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/sqlite3/test.*
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python2.6/unittest/test.*
 
-
 BUILD_DEP_PKGS += CSWlibffi-dev
+BUILD_DEP_PKGS += CSWggettext-dev
+BUILD_DEP_PKGS += CSWlibreadline-dev
+BUILD_DEP_PKGS += CSWlibsqlite3-dev
+BUILD_DEP_PKGS += CSWlibgdbm-dev
+BUILD_DEP_PKGS += CSWlibgcrypt-dev
 
+# Allow to choose the default Python version.
+# Python 2.6 is the default one as of 2013-07-21.
+ALTERNATIVES_CSWpython$(CVER) = python-2.6
+ALTERNATIVE_python-2.6 = $(bindir)/python python-symlink $(bindir)/python2.6 2600
+EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/python
+
 # This could be handled by automatic dependency detection
 CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER)-tk
 
 CATALOGNAME_CSWidle$(CVER)         = idle
 CATALOGNAME_CSWpython$(CVER)       = python
-CATALOGNAME_CSWpython$(CVER)-dev = python$(CVER)_dev
+CATALOGNAME_CSWpython$(CVER)-dev   = python$(CVER)_dev
 CATALOGNAME_CSWpython$(CVER)-tk    = python$(CVER)_tk
 
 SPKG_DESC_CSWidle$(CVER)         = Python IDE
 SPKG_DESC_CSWpython$(CVER)       = A high-level scripting language, $(VER) series
-SPKG_DESC_CSWpython$(CVER)-dev = Development Files for Python
+SPKG_DESC_CSWpython$(CVER)-dev   = Development Files for Python
 SPKG_DESC_CSWpython$(CVER)-tk    = Python Tk Interface (TkInter)
 
 LICENSE = LICENSE
@@ -208,10 +230,11 @@
 
 GARCOMPILER = SOS12U3
 
+
 include gar/category.mk
 EXTRA_PAX_ARGS_32  = -s ",^\.$(includedir)/python$(VER)/pyport.h$$,.$(includedir)/python$(VER)/pyport-32.h,p"
 EXTRA_PAX_ARGS_64  = -s ",^\.$(includedir)/python$(VER)/pyport.h$$,.$(includedir)/python$(VER)/pyport-64.h,p"
-EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_$(MEMORYMODEL))
+EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_$(MEMORYMODEL))
 
 
 post-configure-modulated:
@@ -230,8 +253,8 @@
 post-merge-modulated:
 	# Some checks
 	# Prevent things like https://www.opencsw.org/mantis/view.php?id=5040
-	test ! -f $(PKGROOT)/opt/csw/lib/python/lib-dynload/_socket_failed.so
-	test -f $(PKGROOT)/opt/csw/lib/python/lib-dynload/_socket.so
+	test ! -f $(PKGROOT)/opt/csw/lib/python2.6/lib-dynload/_socket_failed.so
+	test -f $(PKGROOT)/opt/csw/lib/python2.6/lib-dynload/_socket.so
 	# This is post-merge-modulated, which should not work. But it does.
 	ginstall -m 755 -d $(PKGROOT)$(includedir)/python$(VER)
 	ginstall -m 644 $(WORKDIR)/pyport.h $(PKGROOT)$(includedir)/python$(VER)/pyport.h

Added: csw/mgar/pkg/lang-python/python/trunk/files/0015-Look-for-modules-in-the-unversioned-directory.patch
===================================================================
--- csw/mgar/pkg/lang-python/python/trunk/files/0015-Look-for-modules-in-the-unversioned-directory.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-python/python/trunk/files/0015-Look-for-modules-in-the-unversioned-directory.patch	2013-07-22 08:13:19 UTC (rev 21533)
@@ -0,0 +1,26 @@
+From d8a8549dd74e0da789fba02a444b7c617f86f420 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Mon, 22 Jul 2013 01:08:16 +0200
+Subject: [PATCH] Look for modules in the unversioned directory.
+
+---
+ Lib/site.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/Lib/site.py b/Lib/site.py
+index 9afbc09..598d8a8 100644
+--- a/Lib/site.py
++++ b/Lib/site.py
+@@ -268,6 +268,9 @@ def addsitepackages(known_paths):
+             sitedirs.append(os.path.join(prefix, "lib",
+                                         "python" + sys.version[:3],
+                                         "site-packages"))
++            # To find modules in the unversioned directory.
++            sitedirs.append(os.path.join(prefix, "lib",
++                                         "python", "site-packages"))
+             sitedirs.append(os.path.join(prefix, "lib", "site-python"))
+         else:
+             sitedirs.append(prefix)
+-- 
+1.8.3.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