[csw-devel] SF.net SVN: gar:[9386] csw/mgar/pkg/python/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Fri Mar 26 17:20:38 CET 2010
Revision: 9386
http://gar.svn.sourceforge.net/gar/?rev=9386&view=rev
Author: wahwah
Date: 2010-03-26 16:20:38 +0000 (Fri, 26 Mar 2010)
Log Message:
-----------
python: merging the branch to the trunk.
Modified Paths:
--------------
csw/mgar/pkg/python/trunk/Makefile
csw/mgar/pkg/python/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/python/trunk/files/patch_2.diff.txt
Property Changed:
----------------
csw/mgar/pkg/python/trunk/
csw/mgar/pkg/python/trunk/Makefile
Property changes on: csw/mgar/pkg/python/trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /csw/mgar/pkg/python/branches/python-2.6.4+patch7242:8407-9385
Modified: csw/mgar/pkg/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/python/trunk/Makefile 2010-03-26 16:14:27 UTC (rev 9385)
+++ csw/mgar/pkg/python/trunk/Makefile 2010-03-26 16:20:38 UTC (rev 9386)
@@ -1,5 +1,7 @@
+# $Id$
+
GARNAME = Python
-GARVERSION = 2.6.4
+GARVERSION = 2.6.5
CATEGORIES = lang
# Known issues:
@@ -9,7 +11,6 @@
# - http://forums.sun.com/thread.jspa?threadID=5148204
SPKG_SOURCEURL = http://python.org/download/releases/$(GARVERSION)
-SPKG_CLASSES = none cswpycompile
DESCRIPTION = A high-level scripting language.
define BLURB
@@ -43,31 +44,20 @@
PATCHFILES += site.diff
PATCHFILES += python-config-in.diff
PATCHFILES += setup.diff
-PATCHFILES += getpass.patch
# Test for sunaudiodev fails.
SKIPTEST = 1
-DEPENDS += lib/expat
-DEPENDS += lib/openssl
-DEPENDS += lib/db
-DEPENDS += lib/gdbm
+EXTRA_INC += $(prefix)/X11/include
+EXTRA_LIB += $(prefix)/X11/lib
+EXTRA_LIB += $(prefix)/bdb47/lib
+EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
-ifeq ($(shell uname -p), i386)
- BASECFLAGS = -xO3 -xarch=386
-else
- BASECFLAGS = -xO3 -xarch=v8
-endif
+BASECFLAGS = $(CFLAGS)
+EXTRA_COMMON_EXPORTS = BASECFLAGS
-COMPILER_EXPORTS += BASECFLAGS
-
-ifneq ($(shell uname -r), 5.8)
- GARCOMPILER = SOS12
-endif
-
NOISALIST = 1
-LD_OPTIONS = -R/opt/csw/lib
-export LD_OPTIONS
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --enable-shared
CONFIGURE_ARGS += --enable-ipv6
@@ -76,8 +66,9 @@
CONFIGURE_ARGS += --with-signal-module
CONFIGURE_ARGS += --with-fpectl
CONFIGURE_ARGS += --with-system-ffi
-CONFIGURE_ARGS += LDFLAGS='-R/opt/csw/lib -L/opt/csw/lib'
+# This doesn't work here, as _PYCOMPILE_FILES is not the directory Python uses.
+# PYCOMPILE = 1
EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc
# use prototype filters to set the class
PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }'
@@ -85,7 +76,6 @@
PACKAGES = CSWidle
PACKAGES += CSWpython
PACKAGES += CSWpython-devel
-PACKAGES += CSWpython-rt
PACKAGES += CSWpython-test
PACKAGES += CSWpython-tk
@@ -99,7 +89,6 @@
# No idea why would this be in CSWpython, and no good idea for a better package
# to put it.
PKGFILES_CSWpython-devel += $(bindir)/smtpd.py
-PKGFILES_CSWpython-rt = non-existing
PKGFILES_CSWpython-tk = $(libdir)/.*/lib-tk/.*
PKGFILES_CSWpython-tk += $(libdir)/.*/lib-dynload/_tkinter.so.*
PKGFILES_CSWpython-test = $(libdir)/python/test/.*
@@ -111,31 +100,50 @@
PKGFILES_CSWpython-test += $(libdir)/python/lib2to3/tests.*
PKGFILES_CSWpython-test += $(libdir)/python/sqlite3/test.*
-ARCHALL_CSWpython-rt = 1
+ARCHALL_CSWpython-test = 1
+ARCHALL_CSWidle = 1
-RUNTIME_DEP_PKGS_CSWidle = CSWpython CSWpython-tk
-RUNTIME_DEP_PKGS_CSWpython = CSWbdb47 CSWbzip2 CSWgdbm CSWggettextrt
-RUNTIME_DEP_PKGS_CSWpython += CSWncurses CSWosslrt CSWreadline
-RUNTIME_DEP_PKGS_CSWpython += CSWsqlite3rt CSWzlib
-RUNTIME_DEP_PKGS_CSWpython-tk = CSWpython CSWtcl CSWtk
-RUNTIME_DEP_PKGS_CSWpython-devel = CSWpython
-RUNTIME_DEP_PKGS_CSWpython-test = CSWpython
-RUNTIME_DEP_PKGS_CSWpython-rt = CSWpython
+RUNTIME_DEP_PKGS_CSWidle = CSWpython CSWpython-tk
+RUNTIME_DEP_PKGS_CSWpython += CSWbdb47
+RUNTIME_DEP_PKGS_CSWpython += CSWbzip2
+RUNTIME_DEP_PKGS_CSWpython += CSWgdbm
+RUNTIME_DEP_PKGS_CSWpython += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWpython += CSWncurses
+RUNTIME_DEP_PKGS_CSWpython += CSWosslrt
+RUNTIME_DEP_PKGS_CSWpython += CSWreadline
+RUNTIME_DEP_PKGS_CSWpython += CSWsqlite3rt CSWzlib
+RUNTIME_DEP_PKGS_CSWpython-tk += CSWpython
+RUNTIME_DEP_PKGS_CSWpython-tk += CSWtcl
+RUNTIME_DEP_PKGS_CSWpython-tk += CSWtk
+RUNTIME_DEP_PKGS_CSWpython-tk += CSWlibx11
+RUNTIME_DEP_PKGS_CSWpython-devel = CSWpython
+RUNTIME_DEP_PKGS_CSWpython-test += CSWpython
-CATALOGNAME_CSWidle = idle
-CATALOGNAME_CSWpython = python
+CATALOGNAME_CSWidle = idle
+CATALOGNAME_CSWpython = python
CATALOGNAME_CSWpython-devel = python_devel
-CATALOGNAME_CSWpython-rt = python_rt
-CATALOGNAME_CSWpython-tk = python_tk
-CATALOGNAME_CSWpython-test = python_test
+CATALOGNAME_CSWpython-tk = python_tk
+CATALOGNAME_CSWpython-test = python_test
-SPKG_DESC_CSWidle = Python IDE
-SPKG_DESC_CSWpython = A high-level scripting language.
+SPKG_DESC_CSWidle = Python IDE
+SPKG_DESC_CSWpython = A high-level scripting language.
SPKG_DESC_CSWpython-devel = Development Files for Python
-SPKG_DESC_CSWpython-rt = An empty, obsolete package
-SPKG_DESC_CSWpython-tk = Python Tk Interface (TkInter)
-SPKG_DESC_CSWpython-test = Python Test modules
+SPKG_DESC_CSWpython-tk = Python Tk Interface (TkInter)
+SPKG_DESC_CSWpython-test = Python Test modules
+LICENSE = LICENSE
+
+# Need to adjust the RPATH:
+# CHECKPKG_OVERRIDES_CSWpython += missing-dependency|CSWbdb
+# CHECKPKG_OVERRIDES_CSWpython += surplus-dependency|CSWbdb47
+
+# 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
+
include gar/category.mk
post-install-modulated: install-deprecated-libs
Property changes on: csw/mgar/pkg/python/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: csw/mgar/pkg/python/trunk/checksums
===================================================================
--- csw/mgar/pkg/python/trunk/checksums 2010-03-26 16:14:27 UTC (rev 9385)
+++ csw/mgar/pkg/python/trunk/checksums 2010-03-26 16:20:38 UTC (rev 9386)
@@ -1,6 +1,5 @@
-fee5408634a54e721a93531aba37f8c1 Python-2.6.4.tar.bz2
+6bef0417e71a1a1737ccf5750420fdb3 Python-2.6.5.tar.bz2
42dd6523beb94a805d5764ae1276091c faqwiz.diff
-88e213f865894051cdd8d3247502d612 getpass.patch
5664b3970307d7d39d8d4061e7dccbb0 libpython2.5.so.1.0-isa-i386
a87896c48b2f61b32053e6d02b07b022 libpython2.5.so.1.0-isa-sparcv8
33f4094ee46ce865d3973a197f3fb4a0 makesetup.diff
Copied: csw/mgar/pkg/python/trunk/files/patch_2.diff.txt (from rev 9385, csw/mgar/pkg/python/branches/python-2.6.4+patch7242/files/patch_2.diff.txt)
===================================================================
--- csw/mgar/pkg/python/trunk/files/patch_2.diff.txt (rev 0)
+++ csw/mgar/pkg/python/trunk/files/patch_2.diff.txt 2010-03-26 16:20:38 UTC (rev 9386)
@@ -0,0 +1,63 @@
+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
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