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

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Thu Jan 10 14:39:55 CET 2013 

Revision: 20075
          http://gar.svn.sourceforge.net/gar/?rev=20075&view=rev
Author:   wahwah
Date:     2013-01-10 13:39:54 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------
lang-python/python/branches/python-2.7: updated and matched against the 2.6 build recipe

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

Added Paths:
-----------
    csw/mgar/pkg/lang-python/python/branches/python-2.7/files/pyport.h

Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile	2013-01-10 13:34:49 UTC (rev 20074)
+++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile	2013-01-10 13:39:54 UTC (rev 20075)
@@ -2,7 +2,6 @@
 
 NAME = Python
 VERSION = 2.7.3
-CATEGORIES = lang
 VER = 2.7
 DVER = 2-7
 UVER = 2_7
@@ -32,11 +31,11 @@
 
 MASTER_SITES = http://python.org/ftp/python/$(VERSION)/
 UPSTREAM_MASTER_SITES = http://python.org/ftp/python/
+UFILES_REGEX = $(VER)\.\d+
 
 DISTFILES  = $(DISTNAME).tar.bz2
+DISTFILES += pyport.h
 
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
-
 # Patches
 PATCHFILES += faqwiz.diff
 PATCHFILES += makesetup.diff
@@ -49,15 +48,31 @@
 PATCHFILES += setup.diff
 # PATCHFILES += 0001-FFI_DEFAULT_ABI-to-use-__i386.patch
 
-# Test for sunaudiodev fails.
+# The test for sunaudiodev fails.  Not that it's a good practice to skip
+# tests.
 SKIPTEST = 1
 
+# TODO: Enable the 64-bit build at some point.
+# BUILD64 = 1
 
+EXTRA_INC += $(prefix)/bdb47/include
+EXTRA_LIB += $(prefix)/bdb47/lib
+
+# There is a file name conflict over libffi.so symlink between libffi package
+# and a gcc-java package.  While it will ultimately belong to libffi_dev, the
+# symlink is currently under a subdirectory.
+# pkgchk -L CSWlibffi-dev
+# (...)
+# /opt/csw/lib/ffi/libffi.so=../libffi.so.5.0.10 s none CSWlibffi-dev
+EXTRA_LIB += $(libdir)/ffi
+
 BASECFLAGS = $(CFLAGS)
 EXTRA_COMMON_EXPORTS = BASECFLAGS
 
+# To fix https://www.opencsw.org/mantis/view.php?id=5040
+LINKER_IGNORE =
 NOISALIST = 1
-CONFIGURE_ARGS  = $(DIRPATHS) 
+CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared
 CONFIGURE_ARGS += --enable-ipv6
 CONFIGURE_ARGS += --enable-unicode=ucs4
@@ -69,26 +84,20 @@
 # 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 
+# use prototype filters to set the class
 PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }'
 
 PACKAGES  = CSWidle$(CVER)
 PACKAGES += CSWpython$(CVER)
-PACKAGES += CSWpython$(CVER)-test
 PACKAGES += CSWpython$(CVER)-tk
 
 
 PACKAGES += CSWlibpython$(DVER)-1-0
-CATALOGNAME_CSWlibpython$(DVER)-1-0  = libpython$(UVER)_1_0
-PKGFILES_CSWlibpython$(DVER)-1-0 += $(call baseisadirs,$(libdir),libpython$(DVER)\.so\.1\.0(\.\d+)*)
-PKGFILES_CSWlibpython$(DVER)-1-0 += $(libdir)/$(PVER)\.so\.([0-9\.]+)
-SPKG_DESC_CSWlibpython$(DVER)-1-0  = Python shared library ($(VER))
+PKGFILES_CSWlibpython$(DVER)-1-0 += $(call baseisadirs,$(libdir),libpython2\.7\.so\.1\.0)
+PKGFILES_CSWlibpython$(DVER)-1-0 += $(call baseisadirs,$(libdir),libpython2\.7\.so\.1\.0(\.\d+)*)
+SPKG_DESC_CSWlibpython$(DVER)-1-0 += $(DESCRIPTION), libpython2.7.so.1.0
 
-INCOMPATIBLE_PKGS_CSWpython$(CVER) = CSWpydistutils
-
-# Devel package
 PACKAGES += CSWpython$(CVER)-dev
-CATALOGNAME_CSWpython$(CVER)-dev = python_$(CVER)_dev
 SPKG_DESC_CSWpython$(CVER)-dev = Development Files for Python
 # /opt/csw/include/python$(VER)/pyconfig.h is necessary for Python to start up
 PKGFILES_CSWpython$(CVER)-dev += $(includedir)/$(PVER)/(?!pyconfig\.h).*
@@ -98,6 +107,7 @@
 # No idea why would this be in CSWpython, and no good idea for a better package
 # to put it.
 PKGFILES_CSWpython$(CVER)-dev += $(bindir)/smtpd.py-$(VER)
+
 RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWpython$(CVER)
 RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWlibpython$(DVER)-1-0
 CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += surplus-dependency|CSWpython$(CVER)
@@ -109,50 +119,49 @@
 PKGFILES_CSWidle$(CVER) += $(bindir)/idle
 PKGFILES_CSWpython$(CVER)-tk  = $(libdir)/.*/lib-tk/.*
 PKGFILES_CSWpython$(CVER)-tk += $(libdir)/.*/lib-dynload/_tkinter.so.*
-PKGFILES_CSWpython$(CVER)-test  = $(libdir)/$(PVER)/test/.*
-PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/bsddb/test.*
-PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/ctypes/test.*
-PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/email/test.*
-PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/distutils/tests.*
-PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/json/tests.*
-PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/lib2to3/tests.*
-PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/sqlite3/test.*
-PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/unittest/test.*
 
-ARCHALL_CSWpython$(CVER)-test = 1
 ARCHALL_CSWidle$(CVER)        = 1
 
 RUNTIME_DEP_PKGS_CSWidle$(CVER)   += CSWpython$(CVER)
 RUNTIME_DEP_PKGS_CSWidle$(CVER)   += CSWpython$(CVER)-tk
-RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWbzip2
-RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWgdbm
-RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWggettextrt 
-# Was once needed, may need revisiting.
-# RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi
+RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWbdb47
+RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi5
+RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgdbm4
 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpython$(DVER)-1-0
-RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWncurses
-RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWosslrt
-RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWreadline 
-RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWsqlite3rt
-RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWzlib
+RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibncursesw5
+RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpanel5
+RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibreadline6
+RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibsqlite3-0
+RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibz1
 RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk    += CSWlibpython$(DVER)-1-0
+RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk    += CSWlibtcl8-5
+RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk    += CSWlibtk8-5
 RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk    += CSWpython$(CVER)
-RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk    += CSWtcl
-RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk    += CSWtk 
-RUNTIME_DEP_PKGS_CSWpython$(CVER)-test  += CSWpython$(CVER)
 
+# Don't merge test files.
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/test
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/test/.*
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/bsddb/test.*
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/ctypes/test.*
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/email/test.*
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/distutils/tests.*
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/json/tests.*
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/lib2to3/tests.*
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/sqlite3/test.*
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/unittest/test.*
+
+BUILD_DEP_PKGS += CSWlibffi-dev
+BUILD_DEP_PKGS += CSWggettext-dev
+
 # This could be handled by automatic dependency detection
 CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER)-tk
 
-CATALOGNAME_CSWidle$(CVER)         = idle_$(CVER)
-CATALOGNAME_CSWpython$(CVER)       = python_$(CVER)
-CATALOGNAME_CSWpython$(CVER)-tk    = python_$(CVER)_tk
-CATALOGNAME_CSWpython$(CVER)-test  = python_$(CVER)_test
-
 SPKG_DESC_CSWidle$(CVER)         = Python IDE
 SPKG_DESC_CSWpython$(CVER)       = A high-level scripting language, $(VER) series
 SPKG_DESC_CSWpython$(CVER)-tk    = Python Tk Interface (TkInter)
-SPKG_DESC_CSWpython$(CVER)-test  = Python Test modules
 
 CHECKPKG_OVERRIDES_CSWpython$(CVER) += missing-dependency|CSWpython
 CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += missing-dependency|CSWpython
@@ -166,8 +175,8 @@
 # This is an exception, since these are original Python packages.
 CHECKPKG_OVERRIDES_CSWidle$(CVER)         += pkgname-does-not-start-with-CSWpy-
 CHECKPKG_OVERRIDES_CSWidle$(CVER)         += catalogname-does-not-start-with-py_
-CHECKPKG_OVERRIDES_CSWpython$(CVER)-test  += pkgname-does-not-start-with-CSWpy-
-CHECKPKG_OVERRIDES_CSWpython$(CVER)-test  += catalogname-does-not-start-with-py_
+CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += pkgname-does-not-start-with-CSWpy-
+CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += catalogname-does-not-start-with-py_
 CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk    += pkgname-does-not-start-with-CSWpy-
 CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk    += catalogname-does-not-start-with-py_
 CHECKPKG_OVERRIDES_CSWpython$(CVER) += pkgname-does-not-start-with-CSWpy-
@@ -179,6 +188,8 @@
 CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-not-found|libgdbm.so.3|is|needed|by|opt/csw/lib/$(PVER)/lib-dynload/_gdbm.so
 CHECKPKG_OVERRIDES_CSWpython$(CVER) += surplus-dependency|CSWgdbm
 
+CHECKPKG_OVERRIDES_CSWpython27 += file-with-bad-content
+
 # To avoid file collisions with CSWpython:
 EXTRA_PAX_ARGS += -s ',^\.$(bindir)/idle,$(bindir)/idle-$(VER),'
 EXTRA_PAX_ARGS += -s ',^\.$(bindir)/smtpd.py,$(bindir)/smtpd.py-$(VER),'
@@ -186,5 +197,28 @@
 EXTRA_PAX_ARGS += -s ',^\.$(bindir)/2to3,$(bindir)/2to3-$(VER),'
 EXTRA_PAX_ARGS += -s ',^\.$(bindir)/python-config,$(bindir)/python-config-$(VER),'
 EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/python
+ 
+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))
 
 include gar/category.mk
+
+post-configure-modulated:
+	for f in Modules/Setup \
+			Makefile \
+			Makefile.pre \
+			Lib/idlelib/EditorWindow.py \
+			Lib/pydoc_topics.py \
+			Lib/idlelib/config-main.def \
+			; do \
+		gsed -i -e 's+/usr/local+/opt/csw+g' $(WORKSRC)/$${f}; \
+		gsed -i -e 's+/usr/share+/opt/csw/share+g' $(WORKSRC)/$${f}; \
+	done
+	@$(MAKECOOKIE)
+
+post-merge-modulated:
+	echo "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
+	@$(MAKECOOKIE)

Copied: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/pyport.h (from rev 20062, csw/mgar/pkg/lang-python/python/trunk/files/pyport.h)
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/pyport.h	                        (rev 0)
+++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/pyport.h	2013-01-10 13:39:54 UTC (rev 20075)
@@ -0,0 +1,9 @@
+/* Allow 32 and 64 bit headers to coexist */
+#if defined __amd64 || defined __x86_64 || defined __sparcv9
+/*
+ * Eventually, enable this. For now, say we have no headers for 64-bit Python.
+ * #include "pyport-64.h"
+ */
+#else
+#include "pyport-32.h"
+#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