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

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Wed Jan 12 10:19:21 CET 2011


Revision: 12509
          http://gar.svn.sourceforge.net/gar/?rev=12509&view=rev
Author:   wahwah
Date:     2011-01-12 09:19:20 +0000 (Wed, 12 Jan 2011)

Log Message:
-----------
python: Unified python 2.7 and 3.1 builds

As much as possible.

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

Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile	2011-01-12 09:14:34 UTC (rev 12508)
+++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile	2011-01-12 09:19:20 UTC (rev 12509)
@@ -80,7 +80,7 @@
 
 PACKAGES += CSWlibpython$(DVER)-1-0
 CATALOGNAME_CSWlibpython$(DVER)-1-0  = libpython$(UVER)_1_0
-PKGFILES_CSWlibpython2-7-1-0 += $(call baseisadirs,$(libdir),libpython2\.7\.so\.1\.0(\.\d+)*)
+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))
 
@@ -90,8 +90,8 @@
 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).*
-# /opt/csw/include/python2.7/pyconfig.h
 PKGFILES_CSWpython$(CVER)-dev += $(bindir)/.*config.*
 PKGFILES_CSWpython$(CVER)-dev += $(libdir)/pkgconfig.*
 PKGFILES_CSWpython$(CVER)-dev += $(libdir)/libpython$(VER).so
@@ -105,10 +105,6 @@
 CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += pkgname-does-not-start-with-CSWpy-
 CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += catalogname-does-not-start-with-py_
 
-# CHECKPKG_OVERRIDES_CSWpython27 +=
-# dependency-listed-more-than-once|CSWlibpython2-7-1-0
-# CHECKPKG_OVERRIDES_CSWpython27 += surplus-dependency|CSWlibffi
-
 PKGFILES_CSWidle$(CVER) += $(libdir)/.*/idlelib/.*
 PKGFILES_CSWidle$(CVER) += $(bindir)/idle
 PKGFILES_CSWpython$(CVER)-tk  = $(libdir)/.*/lib-tk/.*
@@ -143,7 +139,6 @@
 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)
 
 # This could be handled by automatic dependency detection
@@ -180,7 +175,8 @@
 CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += surplus-dependency|CSWpython$(CVER)
 
 # Checkpkg does not understand relocatable packages.
-CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-not-found|libgdbm.so.3|is|needed|by|opt/csw/lib/python2.7/lib-dynload/gdbm.so
+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) += soname-not-found|libgdbm.so.3|is|needed|by|opt/csw/lib/$(PVER)/lib-dynload/_gdbm.so
 CHECKPKG_OVERRIDES_CSWpython$(CVER) += surplus-dependency|CSWgdbm
 
 # To avoid file collisions with CSWpython:

Modified: csw/mgar/pkg/lang-python/python/branches/python-3.1/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-3.1/Makefile	2011-01-12 09:14:34 UTC (rev 12508)
+++ csw/mgar/pkg/lang-python/python/branches/python-3.1/Makefile	2011-01-12 09:19:20 UTC (rev 12509)
@@ -72,33 +72,50 @@
 
 PACKAGES  = CSWidle$(CVER)
 PACKAGES += CSWpython$(CVER)
-PACKAGES += CSWpython$(CVER)-devel
 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))
 
 INCOMPATIBLE_PKGS_CSWpython$(CVER) = CSWpydistutils
 
-PKGFILES_CSWidle$(CVER)  = $(libdir)/.*/idlelib/.*
-PKGFILES_CSWidle$(CVER) += $(bindir)/idle
-PKGFILES_CSWpython$(CVER)-devel  = $(includedir)/.*
-PKGFILES_CSWpython$(CVER)-devel += $(libdir)/.*/config/.*
-PKGFILES_CSWpython$(CVER)-devel += $(bindir)/.*config.*
-PKGFILES_CSWpython-devel += $(libdir)/libpython$(VER).so
+# 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).*
+PKGFILES_CSWpython$(CVER)-dev += $(bindir)/.*config.*
+PKGFILES_CSWpython$(CVER)-dev += $(libdir)/pkgconfig.*
+PKGFILES_CSWpython$(CVER)-dev += $(libdir)/libpython$(VER).so
 # No idea why would this be in CSWpython, and no good idea for a better package
 # to put it.
-PKGFILES_CSWpython$(CVER)-devel += $(bindir)/smtpd.py
+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)
+CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += missing-dependency|CSWpython
+CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += pkgname-does-not-start-with-CSWpy-
+CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += catalogname-does-not-start-with-py_
+
+PKGFILES_CSWidle$(CVER) += $(libdir)/.*/idlelib/.*
+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)/python/test/.*
-PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/bsddb/test.*
-PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/ctypes/test.*
-PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/email/test.*
-PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/distutils/tests.*
-PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/json/tests.*
-PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/lib2to3/tests.*
-PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/sqlite3/test.*
-PKGFILES_CSWlibpython$(DVER)-1-0 += $(libdir)/libpython$(VER)\.so\.([0-9\.]+)
+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
@@ -118,34 +135,26 @@
 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)-devel += CSWpython$(CVER)
 RUNTIME_DEP_PKGS_CSWpython$(CVER)-test  += CSWpython$(CVER)
-RUNTIME_DEP_PKGS_CSWlibpython$(DVER)-1-0 += CSWggettextrt
 
 # 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)-devel = python_$(CVER)_devel
 CATALOGNAME_CSWpython$(CVER)-tk    = python_$(CVER)_tk
 CATALOGNAME_CSWpython$(CVER)-test  = python_$(CVER)_test
-CATALOGNAME_CSWlibpython$(DVER)-1-0  = libpython$(UVER)_1_0
 
 SPKG_DESC_CSWidle$(CVER)         = Python IDE
 SPKG_DESC_CSWpython$(CVER)       = A high-level scripting language, $(VER) series
-SPKG_DESC_CSWpython$(CVER)-devel = Development Files for Python
 SPKG_DESC_CSWpython$(CVER)-tk    = Python Tk Interface (TkInter)
 SPKG_DESC_CSWpython$(CVER)-test  = Python Test modules
-SPKG_DESC_CSWlibpython$(DVER)-1-0  = Python shared library ($(VER))
 
 CHECKPKG_OVERRIDES_CSWpython$(CVER) += missing-dependency|CSWpython
 CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += missing-dependency|CSWpython
 CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += surplus-dependency|CSWpython$(CVER)
 CHECKPKG_OVERRIDES_CSWidle$(CVER) += missing-dependency|CSWpython
 CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER)
-CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += surplus-dependency|CSWpython$(CVER)
-CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += missing-dependency|CSWpython
 CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += missing-dependency|CSWpython
 
 LICENSE = LICENSE
@@ -155,8 +164,6 @@
 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)-devel += pkgname-does-not-start-with-CSWpy-
-CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += 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-
@@ -168,7 +175,6 @@
 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
 
-
 # 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),'


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