[csw-devel] SF.net SVN: gar:[20062] csw/mgar/pkg/lang-python/python/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Wed Jan 9 18:14:37 CET 2013
Revision: 20062
http://gar.svn.sourceforge.net/gar/?rev=20062&view=rev
Author: wahwah
Date: 2013-01-09 17:14:37 +0000 (Wed, 09 Jan 2013)
Log Message:
-----------
lang-python/python/trunk: Disable pyport headers for 64 bits.
Modified Paths:
--------------
csw/mgar/pkg/lang-python/python/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/lang-python/python/trunk/files/pyport.h
Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/python/trunk/Makefile 2013-01-09 11:46:32 UTC (rev 20061)
+++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2013-01-09 17:14:37 UTC (rev 20062)
@@ -72,9 +72,13 @@
PATCHFILES_5.10 += 0019-Force-multiprocess-to-compile.patch
PATCHFILES += $(PATCHFILES_$(GAROSREL))
-# 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
@@ -90,7 +94,7 @@
EXTRA_COMMON_EXPORTS = BASECFLAGS
NOISALIST = 1
-CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --enable-shared
CONFIGURE_ARGS += --enable-ipv6
CONFIGURE_ARGS += --enable-unicode=ucs4
@@ -102,13 +106,12 @@
# 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)-dev
-PACKAGES += CSWpython$(CVER)-test
PACKAGES += CSWpython$(CVER)-tk
PACKAGES += CSWlibpython$(DVER)-1-0
CATALOGNAME_CSWlibpython$(DVER)-1-0 = libpython$(UVER)_1_0
@@ -130,16 +133,7 @@
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.*
-ARCHALL_CSWpython$(CVER)-test = 1
ARCHALL_CSWidle$(CVER) = 1
RUNTIME_DEP_PKGS_CSWidle$(CVER) += CSWpython$(CVER)
@@ -158,39 +152,44 @@
RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibz1
RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWlibpython$(DVER)-1-0
RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWpython$(CVER)
-RUNTIME_DEP_PKGS_CSWpython$(CVER)-test += CSWpython$(CVER)
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)
+# 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.*
+
+
BUILD_DEP_PKGS += CSWlibffi-dev
# This could be handled by automatic dependency detection
CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER)-tk
-# This package is not meant to be released
-CHECKPKG_OVERRIDES_CSWpython-test += file-with-bad-content
-
CATALOGNAME_CSWidle$(CVER) = idle
CATALOGNAME_CSWpython$(CVER) = python
CATALOGNAME_CSWpython$(CVER)-dev = python$(CVER)_dev
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)-dev = Development Files for Python
SPKG_DESC_CSWpython$(CVER)-tk = Python Tk Interface (TkInter)
-SPKG_DESC_CSWpython$(CVER)-test = Python Test modules
LICENSE = LICENSE
# 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-
@@ -199,7 +198,11 @@
CHECKPKG_OVERRIDES_CSWpython$(CVER) += catalogname-does-not-start-with-py_
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))
+
post-configure-modulated:
for f in Modules/Setup \
Makefile \
@@ -212,3 +215,9 @@
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 $(FILEDIR)/pyport.h $(PKGROOT)$(includedir)/python$(VER)/pyport.h
+ @$(MAKECOOKIE)
Added: csw/mgar/pkg/lang-python/python/trunk/files/pyport.h
===================================================================
--- csw/mgar/pkg/lang-python/python/trunk/files/pyport.h (rev 0)
+++ csw/mgar/pkg/lang-python/python/trunk/files/pyport.h 2013-01-09 17:14:37 UTC (rev 20062)
@@ -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