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

[wahwah at users.sourceforge.net]

Revision: 10886
          http://gar.svn.sourceforge.net/gar/?rev=10886&view=rev
Author:   wahwah
Date:     2010-09-01 21:42:06 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
python: Version bump to 2.6.6

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

Added Paths:
-----------
    csw/mgar/pkg/python/trunk/files/0001-FFI_DEFAULT_ABI-to-use-__i386.patch

Modified: csw/mgar/pkg/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/python/trunk/Makefile	2010-09-01 21:36:04 UTC (rev 10885)
+++ csw/mgar/pkg/python/trunk/Makefile	2010-09-01 21:42:06 UTC (rev 10886)
@@ -1,7 +1,7 @@
 # $Id$
 
 GARNAME = Python
-GARVERSION = 2.6.5
+GARVERSION = 2.6.6
 CATEGORIES = lang
 
 # Known issues:
@@ -9,6 +9,8 @@
 # - No 64-bit build
 # - ctypes module doesn't compile
 #   - http://forums.sun.com/thread.jspa?threadID=5148204
+#   - http://bugs.python.org/issue4902
+#     - Python-2.6.1/Modules/_ctypes/libffi/src/x86/sysv.S
 
 SPKG_SOURCEURL = http://python.org/download/releases/$(GARVERSION)
 
@@ -44,10 +46,12 @@
 PATCHFILES += site.diff
 PATCHFILES += python-config-in.diff
 PATCHFILES += setup.diff
+PATCHFILES += 0001-FFI_DEFAULT_ABI-to-use-__i386.patch
 
 # Test for sunaudiodev fails.
 SKIPTEST = 1
 
+EXTRA_INC += $(prefix)/bdb47/include
 EXTRA_LIB += $(prefix)/bdb47/lib
 
 BASECFLAGS = $(CFLAGS)
@@ -134,12 +138,18 @@
 # These won't be fixed.
 CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/export/medusa|root/opt/csw/lib/libpython2.5.so.1.0
 CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/opt/build|root/opt/csw/lib/libpython2.5.so.1.0
-# Amusingly, now the overrides file contains the bad data.
-CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/export/medusa|root/opt/csw/share/checkpkg/overrides/python
-CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/opt/build|root/opt/csw/share/checkpkg/overrides/python
 
-# http://lists.opencsw.org/pipermail/pkgsubmissions/2010-April/000648.html
-CHECKPKG_OVERRIDES_CSWpython-tk += linked-against-discouraged-library|_tkinter.so|libX11.so.4
+# This is an exception, since these are original Python packages.
+CHECKPKG_OVERRIDES_CSWpython-test  += pkgname-does-not-start-with-CSWpy-
+CHECKPKG_OVERRIDES_CSWpython-test  += catalogname-does-not-start-with-py_
+CHECKPKG_OVERRIDES_CSWpython-tk    += pkgname-does-not-start-with-CSWpy-
+CHECKPKG_OVERRIDES_CSWpython-tk    += catalogname-does-not-start-with-py_
+CHECKPKG_OVERRIDES_CSWidle         += pkgname-does-not-start-with-CSWpy-
+CHECKPKG_OVERRIDES_CSWidle         += catalogname-does-not-start-with-py_
+CHECKPKG_OVERRIDES_CSWpython-devel += pkgname-does-not-start-with-CSWpy-
+CHECKPKG_OVERRIDES_CSWpython-devel += catalogname-does-not-start-with-py_
+CHECKPKG_OVERRIDES_CSWpython       += pkgname-does-not-start-with-CSWpy-
+CHECKPKG_OVERRIDES_CSWpython       += catalogname-does-not-start-with-py_
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/python/trunk/checksums
===================================================================
--- csw/mgar/pkg/python/trunk/checksums	2010-09-01 21:36:04 UTC (rev 10885)
+++ csw/mgar/pkg/python/trunk/checksums	2010-09-01 21:42:06 UTC (rev 10886)
@@ -1,4 +1,5 @@
-6bef0417e71a1a1737ccf5750420fdb3  Python-2.6.5.tar.bz2
+62c1cbc3527d042195699edd2f4993b7  0001-FFI_DEFAULT_ABI-to-use-__i386.patch
+cf4e6881bb84a7ce6089e4a307f71f14  Python-2.6.6.tar.bz2
 42dd6523beb94a805d5764ae1276091c  faqwiz.diff
 5664b3970307d7d39d8d4061e7dccbb0  libpython2.5.so.1.0-isa-i386
 a87896c48b2f61b32053e6d02b07b022  libpython2.5.so.1.0-isa-sparcv8

Added: csw/mgar/pkg/python/trunk/files/0001-FFI_DEFAULT_ABI-to-use-__i386.patch
===================================================================
--- csw/mgar/pkg/python/trunk/files/0001-FFI_DEFAULT_ABI-to-use-__i386.patch	                        (rev 0)
+++ csw/mgar/pkg/python/trunk/files/0001-FFI_DEFAULT_ABI-to-use-__i386.patch	2010-09-01 21:42:06 UTC (rev 10886)
@@ -0,0 +1,29 @@
+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
+


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