From: lars Date: Fri, 6 Mar 2009 20:27:09 +0000 (+0000) Subject: Update python to 2.6.1. X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=a456db34e4ae3a97c80b0bd3ae736ec27954d0df;p=packages.git Update python to 2.6.1. Get rid of the virtual python-core package and instead python depends on python-mini and provides files missing in python-mini for a full featured python installation. Thus also update the dependencies of various python packages. git-svn-id: svn://svn.openwrt.org/openwrt/packages@14760 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/Xorg/lib/hippo-canvas/Makefile b/Xorg/lib/hippo-canvas/Makefile index 39a4b878f..13aa8041b 100644 --- a/Xorg/lib/hippo-canvas/Makefile +++ b/Xorg/lib/hippo-canvas/Makefile @@ -48,7 +48,7 @@ define Package/python-hippo-canvas SUBMENU:=Python TITLE:=Python bindings for hippo canvas URL:=http://developer.mugshot.org/wiki/Hippo_Canvas - DEPENDS:=python-core +PACKAGE_python-hippo-canvas:python-gtk +PACKAGE_python-hippo-canvas:pycairo +hippo-canvas + DEPENDS:=+python-mini +PACKAGE_python-hippo-canvas:python-gtk +PACKAGE_python-hippo-canvas:pycairo +hippo-canvas endef define Build/Configure diff --git a/Xorg/lib/vte/Makefile b/Xorg/lib/vte/Makefile index 3cfea6896..7c2e24804 100644 --- a/Xorg/lib/vte/Makefile +++ b/Xorg/lib/vte/Makefile @@ -46,7 +46,7 @@ define Package/python-vte SUBMENU:=Python TITLE:=Python bindings for vte URL:=http://developer.gnome.org/arch/gnome/widgets/vte.html - DEPENDS:=python-core +PACKAGE_python-vte:python-gtk +vte + DEPENDS:=+python-mini +PACKAGE_python-vte:python-gtk +vte endef define Package/vte/description diff --git a/lang/cython/Makefile b/lang/cython/Makefile index 29e60ed2e..3021be0f6 100644 --- a/lang/cython/Makefile +++ b/lang/cython/Makefile @@ -26,7 +26,7 @@ define Package/cython CATEGORY:=Languages TITLE:=cython URL:=http://www.cython.org - DEPENDS:=python-core + DEPENDS:=+python-mini endef define Package/cython/description diff --git a/lang/egenix-mx/Makefile b/lang/egenix-mx/Makefile index 35bdcf099..cbd9a9b9a 100644 --- a/lang/egenix-mx/Makefile +++ b/lang/egenix-mx/Makefile @@ -26,7 +26,7 @@ define Package/python-egenix-mx SUBMENU:=Python SECTION:=lang CATEGORY:=Languages - DEPENDS:=python-core + DEPENDS:=+python-mini TITLE:=Egenix mxBase URL:=http://www.egenix.com/products/python/mxBase/ endef diff --git a/lang/gst-python/Makefile b/lang/gst-python/Makefile index 56dea37bb..762540c7d 100644 --- a/lang/gst-python/Makefile +++ b/lang/gst-python/Makefile @@ -37,7 +37,7 @@ define Package/gst-python CATEGORY:=Languages TITLE:=python bindings for gstreamer URL:=http://gstreamer.freedesktop.org/ - DEPENDS:=+gstreamer +gst-plugins-base +python-gobject + DEPENDS:=+gstreamer +gst-plugins-base +python-gobject +python-mini endef define Package/gst-python/description diff --git a/lang/kid/Makefile b/lang/kid/Makefile index ff15a5421..f76af0d73 100644 --- a/lang/kid/Makefile +++ b/lang/kid/Makefile @@ -25,7 +25,7 @@ define Package/python-kid SUBMENU:=Python SECTION:=lang CATEGORY:=Languages - DEPENDS:=python-core + DEPENDS:=+python TITLE:=XML-based Templating URL:=http://www.kid-templating.org/ endef diff --git a/lang/logilab-astng/Makefile b/lang/logilab-astng/Makefile index eec67a86f..adf22b661 100644 --- a/lang/logilab-astng/Makefile +++ b/lang/logilab-astng/Makefile @@ -22,7 +22,7 @@ define Package/logilab-astng CATEGORY:=Languages TITLE:=logilab-astng URL:=http://www.logilab.fr - DEPENDS:=python-core + DEPENDS:=+python-mini endef define Package/logilab-astng/description diff --git a/lang/logilab-common/Makefile b/lang/logilab-common/Makefile index 26c31ae95..0cef04a4d 100644 --- a/lang/logilab-common/Makefile +++ b/lang/logilab-common/Makefile @@ -22,7 +22,7 @@ define Package/logilab-common CATEGORY:=Languages TITLE:=logilab-common URL:=http://www.logilab.fr - DEPENDS:=python-core + DEPENDS:=+python-mini endef define Package/logilab-common/description diff --git a/lang/numpy/Makefile b/lang/numpy/Makefile index 4cec5ad6a..03fa91c00 100644 --- a/lang/numpy/Makefile +++ b/lang/numpy/Makefile @@ -23,7 +23,7 @@ define Package/numpy CATEGORY:=Languages TITLE:=numpy URL:=http://numpy.sf.net - DEPENDS:=python-core @TARGET_x86||TARGET_olpc||TARGET_uml @BROKEN + DEPENDS:=+python-mini @TARGET_x86||TARGET_olpc||TARGET_uml @BROKEN endef define Package/numpy/description diff --git a/lang/psycopg/Makefile b/lang/psycopg/Makefile index 10a9905cd..7a445c454 100644 --- a/lang/psycopg/Makefile +++ b/lang/psycopg/Makefile @@ -27,7 +27,7 @@ define Package/python-psycopg CATEGORY:=Languages TITLE:=PostgreSQL database adapter for Python URL:=http://www.initd.org/ - DEPENDS:=python-core +libpq +python-egenix-mx + DEPENDS:=+python-mini +libpq +python-egenix-mx endef define Package/python-psycopg/description diff --git a/lang/pybluez/Makefile b/lang/pybluez/Makefile index 8eb645982..eb6d61e23 100644 --- a/lang/pybluez/Makefile +++ b/lang/pybluez/Makefile @@ -27,7 +27,7 @@ define Package/python-bluez CATEGORY:=Languages TITLE:=Python wrapper for the BlueZ Bluetooth stack URL:=http://org.csail.mit.edu/pybluez/ - DEPENDS:=python-core +bluez-libs + DEPENDS:=+python-mini +bluez-libs endef define Package/python-psycopg/description diff --git a/lang/pycairo/Makefile b/lang/pycairo/Makefile index ffdb5eaa1..c63335b8a 100644 --- a/lang/pycairo/Makefile +++ b/lang/pycairo/Makefile @@ -28,7 +28,7 @@ define Package/pycairo CATEGORY:=Languages TITLE:=Cairo bindings to python URL:=http://www.cairographics.org/pycairo/ - DEPENDS:=python-core +cairo + DEPENDS:=+python-mini +cairo endef define Package/pycairo/description diff --git a/lang/pyevent/Makefile b/lang/pyevent/Makefile index 0b2403e32..ac2bee247 100644 --- a/lang/pyevent/Makefile +++ b/lang/pyevent/Makefile @@ -27,7 +27,7 @@ define Package/python-event CATEGORY:=Languages TITLE:=Python interface to libevent URL:=http://code.google.com/p/pyevent/ - DEPENDS:=python-core +libevent + DEPENDS:=+python-mini +libevent endef define PyPackage/python-event/filespec diff --git a/lang/pygobject/Makefile b/lang/pygobject/Makefile index 066431754..c0995c5d5 100644 --- a/lang/pygobject/Makefile +++ b/lang/pygobject/Makefile @@ -31,7 +31,7 @@ define Package/python-gobject CATEGORY:=Languages TITLE:=GLib bindings for python URL:=http://www.pygtk.org/ - DEPENDS:=python-core +glib2 + DEPENDS:=+python-mini +glib2 +libffi endef define Package/python-gobject/description diff --git a/lang/pygtk/Makefile b/lang/pygtk/Makefile index 24dd565ba..3f0837b8c 100644 --- a/lang/pygtk/Makefile +++ b/lang/pygtk/Makefile @@ -34,7 +34,7 @@ define Package/python-gtk CATEGORY:=Languages TITLE:=GTK bindings for python URL:=http://www.pygtk.org/ - DEPENDS:=python-core +python-gobject +gtk2 +pycairo @!LINUX_2_4 + DEPENDS:=+python-mini +python-gobject +gtk2 +pycairo @!LINUX_2_4 endef define Package/python-gtk/description diff --git a/lang/pymysql/Makefile b/lang/pymysql/Makefile index 8b0486a8d..efda10871 100644 --- a/lang/pymysql/Makefile +++ b/lang/pymysql/Makefile @@ -27,7 +27,7 @@ define Package/python-mysql CATEGORY:=Languages TITLE:=MySQL database adapter for Python URL:=http://mysql-python.sourceforge.net/ - DEPENDS:=python-core +libmysqlclient + DEPENDS:=+python +libmysqlclient endef define Package/python-mysql/description diff --git a/lang/pypcap/Makefile b/lang/pypcap/Makefile index aa3c0e197..87a552a9f 100644 --- a/lang/pypcap/Makefile +++ b/lang/pypcap/Makefile @@ -27,7 +27,7 @@ define Package/python-pcap CATEGORY:=Languages TITLE:=Python interface to lipcap URL:=http://code.google.com/p/pypcap/ - DEPENDS:=python-core +libpcap + DEPENDS:=+python-mini +libpcap endef define PyPackage/python-pcap/filespec diff --git a/lang/pyserial/Makefile b/lang/pyserial/Makefile index c69e5638e..5ddd9f425 100644 --- a/lang/pyserial/Makefile +++ b/lang/pyserial/Makefile @@ -25,7 +25,7 @@ define Package/pyserial CATEGORY:=Languages TITLE:=pyserial URL:=http://pyserial.sourceforge.net - DEPENDS:=python-core + DEPENDS:=+python-mini endef define Package/pyserial/description diff --git a/lang/pysqlite/Makefile b/lang/pysqlite/Makefile index 1746bbf5d..0d3f40904 100644 --- a/lang/pysqlite/Makefile +++ b/lang/pysqlite/Makefile @@ -27,7 +27,7 @@ define Package/python-sqlite CATEGORY:=Languages TITLE:=SQLite database adapter for Python URL:=http://www.initd.org/tracker/pysqlite/wiki/pysqlite - DEPENDS:=python-core +libsqlite3 + DEPENDS:=+python-mini +libsqlite3 endef define Package/python-sqlite/description diff --git a/lang/python-dbus/Makefile b/lang/python-dbus/Makefile index b7b4d6495..985246557 100644 --- a/lang/python-dbus/Makefile +++ b/lang/python-dbus/Makefile @@ -36,7 +36,7 @@ define Package/dbus-python CATEGORY:=Languages TITLE:=Python bindings for dbus URL:=http://dbus.freedesktop.org/ - DEPENDS:=python-core +libdbus-glib + DEPENDS:=+python +libdbus-glib endef define Package/dbus-python/description diff --git a/lang/python-gnome-desktop2/Makefile b/lang/python-gnome-desktop2/Makefile index 929ea6442..75bfec6d0 100644 --- a/lang/python-gnome-desktop2/Makefile +++ b/lang/python-gnome-desktop2/Makefile @@ -37,7 +37,7 @@ define Package/python-gnome-desktop/Default CATEGORY:=Languages TITLE:=$(1) python bindings URL:=http://ftp.gnome.org/ - DEPENDS:=python-core python-gtk $(2) + DEPENDS:=+python-mini python-gtk $(2) endef define Package/python-rsvg diff --git a/lang/python/Makefile b/lang/python/Makefile index 67768adff..b0457135f 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python -PKG_VERSION:=2.5.4 -PKG_RELEASE:=2 +PKG_VERSION:=2.6.1 +PKG_RELEASE:=1 PKG_SOURCE:=Python-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.python.org/ftp/python/$(PKG_VERSION)/ -PKG_MD5SUM:=394a5f56a5ce811fb0f023197ec0833e +PKG_MD5SUM:=e81c2f0953aa60f8062c05a4673f2be0 PKG_BUILD_DIR:=$(BUILD_DIR)/Python-$(PKG_VERSION) @@ -25,7 +25,7 @@ define Package/python/Default SUBMENU:=Python SECTION:=lang CATEGORY:=Languages - TITLE:=Python 2.5 programming language + TITLE:=Python $(PYTHON_VERSION) programming language URL:=http://www.python.org/ endef @@ -41,8 +41,7 @@ endef define Package/python $(call Package/python/Default) TITLE+= (full) - DEPENDS:=+libpthread +zlib +PACKAGE_python:libffi - PROVIDES:=python-core + DEPENDS:=+libpthread +zlib +PACKAGE_python:libffi +python-mini endef define Package/python/description @@ -55,7 +54,6 @@ define Package/python-mini $(call Package/python/Default) TITLE+= (minimal) DEPENDS:=+libpthread +zlib - PROVIDES:=python-core endef define Package/python-mini/description @@ -67,19 +65,25 @@ endef define Package/python-doc $(call Package/python/Default) TITLE:=Python interactive documentation - DEPENDS+= python-core + DEPENDS+=+python-mini endef define Package/python-expat $(call Package/python/Default) TITLE:=Python support for expat - DEPENDS+= python-core +libexpat + DEPENDS+=+python-mini +libexpat endef define Package/python-openssl $(call Package/python/Default) TITLE:=Python support for OpenSSL - DEPENDS+= python-core +libopenssl + DEPENDS+=+python-mini +libopenssl +endef + +define Package/python-sqlite3 +$(call Package/python/Default) + TITLE:=Python support for sqlite3 + DEPENDS+=+python-mini +libsqlite3 endef @@ -103,6 +107,7 @@ endef define Build/Compile -$(MAKE) -C $(PKG_BUILD_DIR) distclean + (cd $(PKG_BUILD_DIR); autoreconf --force --install || exit 0); (cd $(PKG_BUILD_DIR); \ rm -rf config.cache; \ CONFIG_SITE= \ @@ -115,12 +120,10 @@ define Build/Compile HOSTPYTHON=$(PKG_BUILD_DIR)/python \ sharedmods install (cd $(PKG_BUILD_DIR);mv Parser/pgen hostpgen) - - # The python executable needs to stay in the rootdir since its location will - # be used to compute the path of the config files. + # The python executable needs to stay in the rootdir since its location will + # be used to compute the path of the config files. $(CP) $(PKG_BUILD_DIR)/python $(PKG_BUILD_DIR)/hostpython $(MAKE) -C $(PKG_BUILD_DIR) distclean - $(call Build/Configure/Default, \ --sysconfdir=/etc \ --disable-shared \ @@ -129,6 +132,9 @@ define Build/Compile --with-threads \ --with-system-ffi \ ac_cv_lib_readline_readline=no \ + ac_cv_have_chflags=no \ + ac_cv_have_lchflags=no \ + ac_cv_py_format_size_t=no \ OPT="$(TARGET_CFLAGS)" \ ) $(MAKE) -C $(PKG_BUILD_DIR) \ @@ -162,7 +168,7 @@ define Build/InstallDev $(CP) \ $(PKG_INSTALL_DIR)/host/bin/python$(PYTHON_VERSION)-config \ $(2)/bin/ - $(SED) 's,^#!.*,#!/usr/bin/env python2.5,g' $(2)/bin/python$(PYTHON_VERSION)-config + $(SED) 's,^#!.*,#!/usr/bin/env python$(PYTHON_VERSION),g' $(2)/bin/python$(PYTHON_VERSION)-config (cd $(2)/bin; \ ln -sf python$(PYTHON_VERSION)-config python-config;) @@ -170,7 +176,6 @@ endef define PyPackage/python/filespec +|/usr/bin/python$(PYTHON_VERSION) -+|/usr/include/python$(PYTHON_VERSION)/pyconfig.h +|/usr/lib/python$(PYTHON_VERSION) -|/usr/lib/python$(PYTHON_VERSION)/bsddb/test -|/usr/lib/python$(PYTHON_VERSION)/config @@ -180,9 +185,90 @@ define PyPackage/python/filespec -|/usr/lib/python$(PYTHON_VERSION)/distutils/tests -|/usr/lib/python$(PYTHON_VERSION)/email/test -|/usr/lib/python$(PYTHON_VERSION)/idlelib +-|/usr/lib/python$(PYTHON_VERSION)/json/tests -|/usr/lib/python$(PYTHON_VERSION)/lib-tk --|/usr/lib/python$(PYTHON_VERSION)/sqlite3/test +-|/usr/lib/python$(PYTHON_VERSION)/sqlite3 -|/usr/lib/python$(PYTHON_VERSION)/test +-|/usr/lib/python$(PYTHON_VERSION)/lib2to3 +-|/usr/lib/python$(PYTHON_VERSION)/lib-old +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_sqlite3.so +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_ssl.so +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/pyexpat.so +-|/usr/lib/python$(PYTHON_VERSION)/pydoc_topics.py +-|/usr/lib/python$(PYTHON_VERSION)/pydoc.py +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_ctypes_test.so +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_testcapi.so +-|/usr/lib/python$(PYTHON_VERSION)/__future__.py +-|/usr/lib/python$(PYTHON_VERSION)/_abcoll.py +-|/usr/lib/python$(PYTHON_VERSION)/abc.py +-|/usr/lib/python$(PYTHON_VERSION)/codecs.py +-|/usr/lib/python$(PYTHON_VERSION)/compileall.py +-|/usr/lib/python$(PYTHON_VERSION)/ConfigParser.py +-|/usr/lib/python$(PYTHON_VERSION)/copy.py +-|/usr/lib/python$(PYTHON_VERSION)/copy_reg.py +-|/usr/lib/python$(PYTHON_VERSION)/dis.py +-|/usr/lib/python$(PYTHON_VERSION)/encodings +-|/usr/lib/python$(PYTHON_VERSION)/fnmatch.py +-|/usr/lib/python$(PYTHON_VERSION)/genericpath.py +-|/usr/lib/python$(PYTHON_VERSION)/getopt.py +-|/usr/lib/python$(PYTHON_VERSION)/glob.py +-|/usr/lib/python$(PYTHON_VERSION)/hashlib.py +-|/usr/lib/python$(PYTHON_VERSION)/inspect.py +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/array.so +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/binascii.so +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/cStringIO.so +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/fcntl.so +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/grp.so +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/itertools.so +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/math.so +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/operator.so +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_random.so +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/select.so +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_socket.so +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/strop.so +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_struct.so +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/syslog.so +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/time.so +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/unicodedata.so +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/zlib.so +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_weakref.so +-|/usr/lib/python$(PYTHON_VERSION)/linecache.py +-|/usr/lib/python$(PYTHON_VERSION)/md5.py +-|/usr/lib/python$(PYTHON_VERSION)/new.py +-|/usr/lib/python$(PYTHON_VERSION)/opcode.py +-|/usr/lib/python$(PYTHON_VERSION)/optparse.py +-|/usr/lib/python$(PYTHON_VERSION)/os.py +-|/usr/lib/python$(PYTHON_VERSION)/pickle.py +-|/usr/lib/python$(PYTHON_VERSION)/pickle.py +-|/usr/lib/python$(PYTHON_VERSION)/pkgutil.py +-|/usr/lib/python$(PYTHON_VERSION)/popen2.py +-|/usr/lib/python$(PYTHON_VERSION)/posixpath.py +-|/usr/lib/python$(PYTHON_VERSION)/py_compile.py +-|/usr/lib/python$(PYTHON_VERSION)/random.py +-|/usr/lib/python$(PYTHON_VERSION)/repr.py +-|/usr/lib/python$(PYTHON_VERSION)/re.py +-|/usr/lib/python$(PYTHON_VERSION)/sha.py +-|/usr/lib/python$(PYTHON_VERSION)/site.py +-|/usr/lib/python$(PYTHON_VERSION)/socket.py +-|/usr/lib/python$(PYTHON_VERSION)/sre_compile.py +-|/usr/lib/python$(PYTHON_VERSION)/sre_constants.py +-|/usr/lib/python$(PYTHON_VERSION)/sre_parse.py +-|/usr/lib/python$(PYTHON_VERSION)/sre.py +-|/usr/lib/python$(PYTHON_VERSION)/stat.py +-|/usr/lib/python$(PYTHON_VERSION)/StringIO.py +-|/usr/lib/python$(PYTHON_VERSION)/stringprep.py +-|/usr/lib/python$(PYTHON_VERSION)/string.py +-|/usr/lib/python$(PYTHON_VERSION)/struct.py +-|/usr/lib/python$(PYTHON_VERSION)/subprocess.py +-|/usr/lib/python$(PYTHON_VERSION)/tempfile.py +-|/usr/lib/python$(PYTHON_VERSION)/textwrap.py +-|/usr/lib/python$(PYTHON_VERSION)/tokenize.py +-|/usr/lib/python$(PYTHON_VERSION)/token.py +-|/usr/lib/python$(PYTHON_VERSION)/traceback.py +-|/usr/lib/python$(PYTHON_VERSION)/types.py +-|/usr/lib/python$(PYTHON_VERSION)/UserDict.py +-|/usr/lib/python$(PYTHON_VERSION)/warnings.py +-|/usr/lib/python$(PYTHON_VERSION)/weakref.py endef define PyPackage/python/install @@ -192,6 +278,8 @@ endef define PyPackage/python-mini/filespec +|/usr/bin/python$(PYTHON_VERSION) +|/usr/lib/python$(PYTHON_VERSION)/__future__.py ++|/usr/lib/python$(PYTHON_VERSION)/_abcoll.py ++|/usr/lib/python$(PYTHON_VERSION)/abc.py +|/usr/lib/python$(PYTHON_VERSION)/codecs.py +|/usr/lib/python$(PYTHON_VERSION)/compileall.py +|/usr/lib/python$(PYTHON_VERSION)/ConfigParser.py @@ -200,6 +288,7 @@ define PyPackage/python-mini/filespec +|/usr/lib/python$(PYTHON_VERSION)/dis.py +|/usr/lib/python$(PYTHON_VERSION)/encodings +|/usr/lib/python$(PYTHON_VERSION)/fnmatch.py ++|/usr/lib/python$(PYTHON_VERSION)/genericpath.py +|/usr/lib/python$(PYTHON_VERSION)/getopt.py +|/usr/lib/python$(PYTHON_VERSION)/glob.py +|/usr/lib/python$(PYTHON_VERSION)/hashlib.py @@ -221,8 +310,10 @@ define PyPackage/python-mini/filespec +|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/time.so +|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/unicodedata.so +|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/zlib.so ++|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_weakref.so +|/usr/lib/python$(PYTHON_VERSION)/linecache.py +|/usr/lib/python$(PYTHON_VERSION)/md5.py ++|/usr/lib/python$(PYTHON_VERSION)/new.py +|/usr/lib/python$(PYTHON_VERSION)/opcode.py +|/usr/lib/python$(PYTHON_VERSION)/optparse.py +|/usr/lib/python$(PYTHON_VERSION)/os.py @@ -256,6 +347,7 @@ define PyPackage/python-mini/filespec +|/usr/lib/python$(PYTHON_VERSION)/types.py +|/usr/lib/python$(PYTHON_VERSION)/UserDict.py +|/usr/lib/python$(PYTHON_VERSION)/warnings.py ++|/usr/lib/python$(PYTHON_VERSION)/weakref.py endef define PyPackage/python-mini/install @@ -263,6 +355,7 @@ define PyPackage/python-mini/install endef define PyPackage/python-doc/filespec ++|/usr/lib/python$(PYTHON_VERSION)/pydoc_topics.py +|/usr/lib/python$(PYTHON_VERSION)/pydoc.py endef @@ -285,4 +378,3 @@ $(eval $(call BuildPackage,python-mini)) $(eval $(call BuildPackage,python-doc)) $(eval $(call BuildPackage,python-expat)) $(eval $(call BuildPackage,python-openssl)) - diff --git a/lang/python/files/python-package.mk b/lang/python/files/python-package.mk index 64b65da94..0f5204fe4 100644 --- a/lang/python/files/python-package.mk +++ b/lang/python/files/python-package.mk @@ -6,7 +6,7 @@ # # $Id$ -PYTHON_VERSION=2.5 +PYTHON_VERSION=2.6 PYTHON_DIR:=$(STAGING_DIR)/usr PYTHON_BIN_DIR:=$(PYTHON_DIR)/bin @@ -25,24 +25,24 @@ define PyPackage IFS='|'; \ while read fop fspec fperm; do \ if [ "$$$$$$$$fop" = "+" ]; then \ - dpath=`dirname "$$$$$$$$fspec"`; \ - if [ -n "$$$$$$$$fperm" ]; then \ - dperm="-m$$$$$$$$fperm"; \ - else \ - dperm=`stat -c "%a" $(PKG_INSTALL_DIR)$$$$$$$$dpath`; \ - fi; \ - mkdir -p $$$$$$$$$dperm $$(1)$$$$$$$$dpath; \ - echo "copying: '$$$$$$$$fspec'"; \ - cp -fpR $(PKG_INSTALL_DIR)$$$$$$$$fspec $$(1)$$$$$$$$dpath/; \ - if [ -n "$$$$$$$$fperm" ]; then \ - chmod -R $$$$$$$$fperm $$(1)$$$$$$$$fspec; \ - fi; \ + dpath=`dirname "$$$$$$$$fspec"`; \ + if [ -n "$$$$$$$$fperm" ]; then \ + dperm="-m$$$$$$$$fperm"; \ + else \ + dperm=`stat -c "%a" $(PKG_INSTALL_DIR)$$$$$$$$dpath`; \ + fi; \ + mkdir -p $$$$$$$$$dperm $$(1)$$$$$$$$dpath; \ + echo "copying: '$$$$$$$$fspec'"; \ + cp -fpR $(PKG_INSTALL_DIR)$$$$$$$$fspec $$(1)$$$$$$$$dpath/; \ + if [ -n "$$$$$$$$fperm" ]; then \ + chmod -R $$$$$$$$fperm $$(1)$$$$$$$$fspec; \ + fi; \ elif [ "$$$$$$$$fop" = "-" ]; then \ - echo "removing: '$$$$$$$$fspec'"; \ - rm -fR $$(1)$$$$$$$$fspec; \ + echo "removing: '$$$$$$$$fspec'"; \ + rm -fR $$(1)$$$$$$$$fspec; \ elif [ "$$$$$$$$fop" = "=" ]; then \ - echo "setting permissions: '$$$$$$$$fperm' on '$$$$$$$$fspec'"; \ - chmod -R $$$$$$$$fperm $$(1)$$$$$$$$fspec; \ + echo "setting permissions: '$$$$$$$$fperm' on '$$$$$$$$fspec'"; \ + chmod -R $$$$$$$$fperm $$(1)$$$$$$$$fspec; \ fi; \ done; \ ) @@ -56,7 +56,7 @@ define Build/Compile/PyMod CPPFLAGS="$(TARGET_CPPFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ $(3) \ - $(PYTHON) ./setup.py $(2); \ + $(PYTHON) ./setup.py $(2) && \ find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f \ ); endef diff --git a/lang/python/patches/000-cross-compile.patch b/lang/python/patches/000-cross-compile.patch index 0616eb425..4cbab182f 100644 --- a/lang/python/patches/000-cross-compile.patch +++ b/lang/python/patches/000-cross-compile.patch @@ -2,7 +2,7 @@ Index: Python-2.5.1/Makefile.pre.in =================================================================== --- Python-2.5.1.orig/Makefile.pre.in 2007-07-30 12:55:24.000000000 -0500 +++ Python-2.5.1/Makefile.pre.in 2007-07-30 12:55:24.000000000 -0500 -@@ -170,6 +170,7 @@ +@@ -175,6 +175,7 @@ PYTHON= python$(EXE) BUILDPYTHON= python$(BUILDEXE) @@ -10,7 +10,7 @@ Index: Python-2.5.1/Makefile.pre.in # === Definitions added by makesetup === -@@ -196,7 +197,7 @@ +@@ -205,7 +206,7 @@ ########################################################################## # Parser PGEN= Parser/pgen$(EXE) @@ -19,28 +19,28 @@ Index: Python-2.5.1/Makefile.pre.in POBJS= \ Parser/acceler.o \ Parser/grammar1.o \ -@@ -345,8 +346,8 @@ +@@ -394,8 +395,8 @@ # Build the shared modules sharedmods: $(BUILDPYTHON) - case $$MAKEFLAGS in \ -- *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ + @case $$MAKEFLAGS in \ +- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ - *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ -+ *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \ ++ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \ + *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \ - esac + esac # Build static library -@@ -470,8 +471,8 @@ +@@ -512,8 +513,8 @@ $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) - -@ mkdir Include + -@$(INSTALL) -d Include - -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) + -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) $(PGEN): $(PGENOBJS) $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) -@@ -885,7 +886,7 @@ +@@ -993,7 +994,7 @@ # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: @@ -49,37 +49,70 @@ Index: Python-2.5.1/Makefile.pre.in --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ -Index: Python-2.5.1/setup.py -=================================================================== ---- Python-2.5.1.orig/setup.py 2007-07-30 12:55:24.000000000 -0500 -+++ Python-2.5.1/setup.py 2007-07-30 12:57:10.000000000 -0500 -@@ -209,6 +209,7 @@ - try: - imp.load_dynamic(ext.name, ext_filename) - except ImportError, why: -+ return - self.announce('*** WARNING: renaming "%s" since importing it' - ' failed: %s' % (ext.name, why), level=3) - assert not self.inplace -@@ -244,8 +245,6 @@ - - def detect_modules(self): - # Ensure that /usr/local is always used -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - - # Add paths specified in the environment variables LDFLAGS and - # CPPFLAGS for header and library files. -@@ -279,12 +278,6 @@ - for directory in options.dirs: - add_dir_to_list(dir_list, directory) - -- if os.path.normpath(sys.prefix) != '/usr': -- add_dir_to_list(self.compiler.library_dirs, -- sysconfig.get_config_var("LIBDIR")) -- add_dir_to_list(self.compiler.include_dirs, -- sysconfig.get_config_var("INCLUDEDIR")) -- - try: - have_unicode = unicode - except NameError: +diff --git a/Makefile.pre.in b/Makefile.pre.in +index c2ce5c6..63dc91e 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -371,7 +371,7 @@ build_all_generate_profile: + $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov" + + run_profile_task: +- ./$(BUILDPYTHON) $(PROFILE_TASK) ++ $(HOSTPYTHON) $(PROFILE_TASK) + + build_all_use_profile: + $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use" +@@ -389,7 +389,7 @@ $(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY) + $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) + + platform: $(BUILDPYTHON) +- $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform ++ $(RUNSHARED) $(HOSTPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform + + + # Build the shared modules +@@ -669,7 +669,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS) + + TESTOPTS= -l $(EXTRATESTOPTS) + TESTPROG= $(srcdir)/Lib/test/regrtest.py +-TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) -E -tt ++TESTPYTHON= $(RUNSHARED) $(HOSTPYTHON) -E -tt + test: all platform + -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f + +@@ -1032,7 +1014,7 @@ frameworkinstallstructure: $(LDLIBRARY) + fi; \ + done + $(LN) -fsn include/python$(VERSION) $(DESTDIR)$(prefix)/Headers +- sed 's/%VERSION%/'"`$(RUNSHARED) ./$(BUILDPYTHON) -c 'import platform; print platform.python_version()'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist ++ sed 's/%VERSION%/'"`$(RUNSHARED) $(HOSTPYTHON) -c 'import platform; print platform.python_version()'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist + $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current + $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK) + $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers +@@ -1074,7 +1056,7 @@ frameworkinstallextras: + # This installs a few of the useful scripts in Tools/scripts + scriptsinstall: + SRCDIR=$(srcdir) $(RUNSHARED) \ +- ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \ ++ $(HOSTPYTHON) $(srcdir)/Tools/scripts/setup.py install \ + --prefix=$(prefix) \ + --install-scripts=$(BINDIR) \ + --root=/$(DESTDIR) +@@ -1096,7 +1078,7 @@ config.status: $(srcdir)/configure + + # Run reindent on the library + reindent: +- ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib ++ $(HOSTPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib + + # Rerun configure with the same options as it was run last time, + # provided the config.status script exists +@@ -1192,7 +1174,7 @@ funny: + + # Perform some verification checks on any modified files. + patchcheck: +- $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py ++ $(RUNSHARED) $(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py + + # Dependencies + diff --git a/lang/python/patches/001-cross-compile.patch b/lang/python/patches/001-cross-compile.patch deleted file mode 100644 index 73a3e336b..000000000 --- a/lang/python/patches/001-cross-compile.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: Python-2.5.1/setup.py -=================================================================== ---- Python-2.5.1.orig/setup.py 2007-07-30 12:55:24.000000000 -0500 -+++ Python-2.5.1/setup.py 2007-07-30 12:57:03.000000000 -0500 -@@ -244,7 +244,18 @@ - return sys.platform - - def detect_modules(self): -- # Ensure that /usr/local is always used -+ try: -+ modules_include_dirs = os.environ["PYTHON_MODULES_INCLUDE"].split() -+ except KeyError: -+ modules_include_dirs = ['/usr/include'] -+ try: -+ modules_lib_dirs = os.environ["PYTHON_MODULES_LIB"].split() -+ except KeyError: -+ modules_lib_dirs = ['/usr/lib'] -+ for dir in modules_include_dirs: -+ add_dir_to_list(self.compiler.include_dirs, dir) -+ for dir in modules_lib_dirs: -+ add_dir_to_list(self.compiler.library_dirs, dir) - - # Add paths specified in the environment variables LDFLAGS and - # CPPFLAGS for header and library files. -@@ -286,11 +297,8 @@ - # lib_dirs and inc_dirs are used to search for files; - # if a file is found in one of those directories, it can - # be assumed that no additional -I,-L directives are needed. -- lib_dirs = self.compiler.library_dirs + [ -- '/lib64', '/usr/lib64', -- '/lib', '/usr/lib', -- ] -- inc_dirs = self.compiler.include_dirs + ['/usr/include'] -+ lib_dirs = self.compiler.library_dirs -+ inc_dirs = self.compiler.include_dirs - exts = [] - - config_h = sysconfig.get_config_h_filename() diff --git a/lang/python/patches/010-cannot-run-test-programm.patch b/lang/python/patches/010-cannot-run-test-programm.patch new file mode 100644 index 000000000..39da9dfdc --- /dev/null +++ b/lang/python/patches/010-cannot-run-test-programm.patch @@ -0,0 +1,87 @@ +diff --git a/configure.in b/configure.in +index 14095a1..e7ab47f 100644 +--- a/configure.in ++++ b/configure.in +@@ -2559,6 +2559,7 @@ AC_CHECK_LIB(c, inet_aton, [$ac_cv_prog_TRUE], + # On Tru64, chflags seems to be present, but calling it will + # exit Python + AC_MSG_CHECKING(for chflags) ++AC_CACHE_VAL(ac_cv_have_chflags, [ + AC_TRY_RUN([ + #include + #include +@@ -2568,12 +2569,19 @@ int main(int argc, char*argv[]) + return 1; + return 0; + } +-],AC_DEFINE(HAVE_CHFLAGS, 1, Define to 1 if you have the `chflags' function.) +- AC_MSG_RESULT(yes), +- AC_MSG_RESULT(no) +-) ++], ++ac_cv_have_chflags=yes, ++ac_cv_have_chflags=no, ++ac_cv_have_chflags=no)]) ++AC_MSG_RESULT($ac_cv_have_chflags) ++if test "$ac_cv_have_chflags" = yes ++then ++ AC_DEFINE(HAVE_CHFLAGS, 1, ++ [Define to 1 if you have the `chflags' function.]) ++fi + + AC_MSG_CHECKING(for lchflags) ++AC_CACHE_VAL(ac_cv_have_lchflags, [ + AC_TRY_RUN([ + #include + #include +@@ -2583,10 +2591,16 @@ int main(int argc, char*argv[]) + return 1; + return 0; + } +-],AC_DEFINE(HAVE_LCHFLAGS, 1, Define to 1 if you have the `lchflags' function.) +- AC_MSG_RESULT(yes), +- AC_MSG_RESULT(no) +-) ++], ++ac_cv_have_lchflags=yes, ++ac_cv_have_lchflags=no, ++ac_cv_have_lchflags=no)]) ++AC_MSG_RESULT($ac_cv_have_lchflags) ++if test "$ac_cv_have_lchflags" = yes ++then ++ AC_DEFINE(HAVE_CHFLAGS, 1, ++ [Define to 1 if you have the `lchflags' function.]) ++fi + + dnl Check if system zlib has *Copy() functions + dnl +@@ -3664,6 +3664,7 @@ else + fi + + AC_MSG_CHECKING(for %zd printf() format support) ++AC_CACHE_VAL(ac_cv_py_format_size_t, [ + AC_TRY_RUN([#include + #include + #include +@@ -3697,10 +3698,17 @@ int main() + return 1; + + return 0; +-}], +-[AC_MSG_RESULT(yes) +- AC_DEFINE(PY_FORMAT_SIZE_T, "z", [Define to printf format modifier for Py_ssize_t])], +- AC_MSG_RESULT(no)) ++} ++], ++ac_cv_py_format_size_t=yes, ++ac_cv_py_format_size_t=no, ++ac_cv_py_format_size_t=no)]) ++AC_MSG_RESULT($ac_cv_py_format_size_t) ++if test "$ac_cv_pyt_format_t" = yes ++then ++ AC_DEFINE(PY_FORMAT_SIZE_T, "z", ++ [Define to printf format modifier for Py_ssize_t]) ++fi + + AC_CHECK_TYPE(socklen_t,, + AC_DEFINE(socklen_t,int, diff --git a/lang/python/patches/010-disable_modules_and_ssl.patch b/lang/python/patches/010-disable_modules_and_ssl.patch deleted file mode 100644 index 084af942a..000000000 --- a/lang/python/patches/010-disable_modules_and_ssl.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: Python-2.5.1/setup.py -=================================================================== ---- Python-2.5.1.orig/setup.py 2007-07-30 12:55:24.000000000 -0500 -+++ Python-2.5.1/setup.py 2007-07-30 12:55:24.000000000 -0500 -@@ -15,7 +15,14 @@ - from distutils.command.install_lib import install_lib - - # This global variable is used to hold the list of modules to be disabled. --disabled_module_list = [] -+try: -+ disabled_module_list = os.environ["PYTHON_DISABLE_MODULES"].split() -+except KeyError: -+ disabled_module_list = [] -+try: -+ disable_ssl = os.environ["PYTHON_DISABLE_SSL"] -+except KeyError: -+ disable_ssl = 0 - - def add_dir_to_list(dirlist, dir): - """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -244,6 +251,7 @@ - return sys.platform - - def detect_modules(self): -+ global disable_ssl - try: - modules_include_dirs = os.environ["PYTHON_MODULES_INCLUDE"].split() - except KeyError: -@@ -538,7 +546,8 @@ - ] ) - - if (ssl_incs is not None and -- ssl_libs is not None): -+ ssl_libs is not None and -+ not disable_ssl): - exts.append( Extension('_ssl', ['_ssl.c'], - include_dirs = ssl_incs, - library_dirs = ssl_libs, diff --git a/lang/python/patches/020-dont-compile-python-files.patch b/lang/python/patches/020-dont-compile-python-files.patch new file mode 100644 index 000000000..224d466eb --- /dev/null +++ b/lang/python/patches/020-dont-compile-python-files.patch @@ -0,0 +1,27 @@ +diff --git a/Makefile.pre.in b/Makefile.pre.in +index a341e63..e949653 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -879,22 +879,6 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) + done; \ + done + $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt +- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ +- -d $(LIBDEST) -f \ +- -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST) +- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ +- -d $(LIBDEST) -f \ +- -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST) +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ +- -d $(LIBDEST)/site-packages -f \ +- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ +- -d $(LIBDEST)/site-packages -f \ +- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + ./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()" + diff --git a/lang/python/patches/020-gentoo_py_dontcompile.patch b/lang/python/patches/020-gentoo_py_dontcompile.patch deleted file mode 100644 index 38356fe68..000000000 --- a/lang/python/patches/020-gentoo_py_dontcompile.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: Python-2.5.1/Python/import.c -=================================================================== ---- Python-2.5.1.orig/Python/import.c 2007-07-30 12:55:23.000000000 -0500 -+++ Python-2.5.1/Python/import.c 2007-07-30 12:55:24.000000000 -0500 -@@ -864,8 +864,12 @@ - write_compiled_module(PyCodeObject *co, char *cpathname, time_t mtime) - { - FILE *fp; -+ char *py_dontcompile = getenv("PYTHON_DONTCOMPILE"); - -+ if (!py_dontcompile) - fp = open_exclusive(cpathname); -+ else -+ fp = NULL; - if (fp == NULL) { - if (Py_VerboseFlag) - PySys_WriteStderr( diff --git a/lang/python/patches/030-cant_check_files.patch b/lang/python/patches/030-cant_check_files.patch deleted file mode 100644 index d8b1a3206..000000000 --- a/lang/python/patches/030-cant_check_files.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -Naur Python-2.5.4/configure Python-2.5.4-cross/configure ---- Python-2.5.4/configure 2008-12-13 15:13:52.000000000 +0100 -+++ Python-2.5.4-cross/configure 2009-01-01 15:16:01.000000000 +0100 -@@ -22326,39 +22326,6 @@ - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - --{ echo "$as_me:$LINENO: checking for /dev/ptmx" >&5 --echo $ECHO_N "checking for /dev/ptmx... $ECHO_C" >&6; } -- --if test -r /dev/ptmx --then -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_DEV_PTMX 1 --_ACEOF -- --else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } --fi -- --{ echo "$as_me:$LINENO: checking for /dev/ptc" >&5 --echo $ECHO_N "checking for /dev/ptc... $ECHO_C" >&6; } -- --if test -r /dev/ptc --then -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_DEV_PTC 1 --_ACEOF -- --else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } --fi - - case $MACHDEP in - darwin) -@@ -22426,96 +22393,6 @@ - - - --{ echo "$as_me:$LINENO: checking for %zd printf() format support" >&5 --echo $ECHO_N "checking for %zd printf() format support... $ECHO_C" >&6; } --if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --#include --#include -- --#ifdef HAVE_SYS_TYPES_H --#include --#endif -- --#ifdef HAVE_SSIZE_T --typedef ssize_t Py_ssize_t; --#elif SIZEOF_VOID_P == SIZEOF_LONG --typedef long Py_ssize_t; --#else --typedef int Py_ssize_t; --#endif -- --int main() --{ -- char buffer[256]; -- -- if(sprintf(buffer, "%zd", (size_t)123) < 0) -- return 1; -- -- if (strcmp(buffer, "123")) -- return 1; -- -- if (sprintf(buffer, "%zd", (Py_ssize_t)-123) < 0) -- return 1; -- -- if (strcmp(buffer, "-123")) -- return 1; -- -- return 0; --} --_ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -- --cat >>confdefs.h <<\_ACEOF --#define PY_FORMAT_SIZE_T "z" --_ACEOF -- --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) --{ echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi -- -- - - { echo "$as_me:$LINENO: checking for socklen_t" >&5 - echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; } diff --git a/lang/python/patches/030-fixup-include-dirs.patch b/lang/python/patches/030-fixup-include-dirs.patch new file mode 100644 index 000000000..eba4d2563 --- /dev/null +++ b/lang/python/patches/030-fixup-include-dirs.patch @@ -0,0 +1,40 @@ +diff --git a/setup.py b/setup.py +index 32e1af8..f7f190f 100644 +--- a/setup.py ++++ b/setup.py +@@ -309,9 +309,6 @@ class PyBuildExt(build_ext): + return sys.platform + + def detect_modules(self): +- # Ensure that /usr/local is always used +- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') +- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + + # Add paths specified in the environment variables LDFLAGS and + # CPPFLAGS for header and library files. +@@ -347,11 +344,6 @@ class PyBuildExt(build_ext): + for directory in reversed(options.dirs): + add_dir_to_list(dir_list, directory) + +- if os.path.normpath(sys.prefix) != '/usr': +- add_dir_to_list(self.compiler.library_dirs, +- sysconfig.get_config_var("LIBDIR")) +- add_dir_to_list(self.compiler.include_dirs, +- sysconfig.get_config_var("INCLUDEDIR")) + + try: + have_unicode = unicode +@@ -361,11 +353,8 @@ class PyBuildExt(build_ext): + # lib_dirs and inc_dirs are used to search for files; + # if a file is found in one of those directories, it can + # be assumed that no additional -I,-L directives are needed. +- lib_dirs = self.compiler.library_dirs + [ +- '/lib64', '/usr/lib64', +- '/lib', '/usr/lib', +- ] +- inc_dirs = self.compiler.include_dirs + ['/usr/include'] ++ lib_dirs = self.compiler.library_dirs ++ inc_dirs = self.compiler.include_dirs + exts = [] + missing = [] + diff --git a/lang/python/patches/040-dont-import-cross-compiled-modules.patch b/lang/python/patches/040-dont-import-cross-compiled-modules.patch new file mode 100644 index 000000000..8d96020c5 --- /dev/null +++ b/lang/python/patches/040-dont-import-cross-compiled-modules.patch @@ -0,0 +1,41 @@ +diff --git a/setup.py b/setup.py +index f7f190f..6ca7a1d 100644 +--- a/setup.py ++++ b/setup.py +@@ -270,36 +270,6 @@ class PyBuildExt(build_ext): + ext_filename = os.path.join( + self.build_lib, + self.get_ext_filename(self.get_ext_fullname(ext.name))) +- try: +- imp.load_dynamic(ext.name, ext_filename) +- except ImportError, why: +- self.failed.append(ext.name) +- self.announce('*** WARNING: renaming "%s" since importing it' +- ' failed: %s' % (ext.name, why), level=3) +- assert not self.inplace +- basename, tail = os.path.splitext(ext_filename) +- newname = basename + "_failed" + tail +- if os.path.exists(newname): +- os.remove(newname) +- os.rename(ext_filename, newname) +- +- # XXX -- This relies on a Vile HACK in +- # distutils.command.build_ext.build_extension(). The +- # _built_objects attribute is stored there strictly for +- # use here. +- # If there is a failure, _built_objects may not be there, +- # so catch the AttributeError and move on. +- try: +- for filename in self._built_objects: +- os.remove(filename) +- except AttributeError: +- self.announce('unable to remove files (ignored)') +- except: +- exc_type, why, tb = sys.exc_info() +- self.announce('*** WARNING: importing extension "%s" ' +- 'failed with %s: %s' % (ext.name, exc_type, why), +- level=3) +- self.failed.append(ext.name) + + def get_platform(self): + diff --git a/lang/python/patches/040-dont_make_pyc.patch b/lang/python/patches/040-dont_make_pyc.patch deleted file mode 100644 index 99fe50460..000000000 --- a/lang/python/patches/040-dont_make_pyc.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- Python-2.5/Makefile.pre.in 2007-04-19 18:46:05.510965874 -0500 -+++ Python-2.5.new/Makefile.pre.in 2007-04-19 18:44:45.650965874 -0500 -@@ -773,22 +773,6 @@ - done; \ - done - $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -- -d $(LIBDEST) -f \ -- -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST) -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ -- -d $(LIBDEST) -f \ -- -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST) -- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ -- -d $(LIBDEST)/site-packages -f \ -- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ -- -d $(LIBDEST)/site-packages -f \ -- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - - # Create the PLATDIR source directory, if one wasn't distributed.. - $(srcdir)/Lib/$(PLATDIR): diff --git a/lang/python/patches/050-add_signal_set_wakeup_fd.patch b/lang/python/patches/050-add_signal_set_wakeup_fd.patch deleted file mode 100644 index 6e189d077..000000000 --- a/lang/python/patches/050-add_signal_set_wakeup_fd.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff -urN Python-2.5.1.orig/Include/pyerrors.h Python-2.5.1/Include/pyerrors.h ---- Python-2.5.1.orig/Include/pyerrors.h 2008-08-10 13:46:48.000000000 +0200 -+++ Python-2.5.1/Include/pyerrors.h 2008-08-10 13:51:05.000000000 +0200 -@@ -239,6 +239,9 @@ - PyAPI_FUNC(int) PyErr_CheckSignals(void); - PyAPI_FUNC(void) PyErr_SetInterrupt(void); - -+/* In signalmodule.c */ -+int PySignal_SetWakeupFd(int fd); -+ - /* Support for adding program text to SyntaxErrors */ - PyAPI_FUNC(void) PyErr_SyntaxLocation(const char *, int); - PyAPI_FUNC(PyObject *) PyErr_ProgramText(const char *, int); -diff -urN Python-2.5.1.orig/Modules/signalmodule.c Python-2.5.1/Modules/signalmodule.c ---- Python-2.5.1.orig/Modules/signalmodule.c 2008-08-10 13:46:48.000000000 +0200 -+++ Python-2.5.1/Modules/signalmodule.c 2008-08-10 13:50:02.000000000 +0200 -@@ -12,6 +12,8 @@ - - #include - -+#include -+ - #ifndef SIG_ERR - #define SIG_ERR ((PyOS_sighandler_t)(-1)) - #endif -@@ -75,4 +77,6 @@ - PyObject *func; - } Handlers[NSIG]; - -+static int wakeup_fd = -1; -+ - /* Speed up sigcheck() when none tripped */ -@@ -112,6 +116,7 @@ - static void - signal_handler(int sig_num) - { -+ const char dummy_byte = '\0'; - #ifdef WITH_THREAD - #ifdef WITH_PTH - if (PyThread_get_thread_ident() != main_thread) { -@@ -125,6 +130,8 @@ - is_tripped++; - Handlers[sig_num].tripped = 1; - Py_AddPendingCall(checksignals_witharg, NULL); -+ if (wakeup_fd != -1) -+ write(wakeup_fd, &dummy_byte, 1); - #ifdef WITH_THREAD - } - #endif -@@ -264,6 +271,50 @@ - anything else -- the callable Python object used as a handler"); - - -+static PyObject * -+signal_set_wakeup_fd(PyObject *self, PyObject *args) -+{ -+ struct stat buf; -+ int fd, old_fd; -+ if (!PyArg_ParseTuple(args, "i:set_wakeup_fd", &fd)) -+ return NULL; -+#ifdef WITH_THREAD -+ if (PyThread_get_thread_ident() != main_thread) { -+ PyErr_SetString(PyExc_ValueError, -+ "set_wakeup_fd only works in main thread"); -+ return NULL; -+ } -+#endif -+ if (fd != -1 && fstat(fd, &buf) != 0) { -+ PyErr_SetString(PyExc_ValueError, "invalid fd"); -+ return NULL; -+ } -+ old_fd = wakeup_fd; -+ wakeup_fd = fd; -+ return PyLong_FromLong(old_fd); -+} -+ -+PyDoc_STRVAR(set_wakeup_fd_doc, -+"set_wakeup_fd(fd) -> fd\n\ -+\n\ -+Sets the fd to be written to (with '\\0') when a signal\n\ -+comes in. A library can use this to wakeup select or poll.\n\ -+The previous fd is returned.\n\ -+\n\ -+The fd must be non-blocking."); -+ -+/* C API for the same, without all the error checking */ -+int -+PySignal_SetWakeupFd(int fd) -+{ -+ int old_fd = wakeup_fd; -+ if (fd < 0) -+ fd = -1; -+ wakeup_fd = fd; -+ return old_fd; -+} -+ -+ - /* List of functions defined in the module */ - static PyMethodDef signal_methods[] = { - #ifdef HAVE_ALARM -@@ -271,6 +322,7 @@ - #endif - {"signal", signal_signal, METH_VARARGS, signal_doc}, - {"getsignal", signal_getsignal, METH_VARARGS, getsignal_doc}, -+ {"set_wakeup_fd", signal_set_wakeup_fd, METH_VARARGS, set_wakeup_fd_doc}, - #ifdef HAVE_PAUSE - {"pause", (PyCFunction)signal_pause, - METH_NOARGS,pause_doc}, diff --git a/lang/python/patches/080-distutils-dont_adjust_files.patch b/lang/python/patches/080-distutils-dont_adjust_files.patch index b8949c9c9..169860706 100644 --- a/lang/python/patches/080-distutils-dont_adjust_files.patch +++ b/lang/python/patches/080-distutils-dont_adjust_files.patch @@ -1,7 +1,8 @@ -diff -ruN Python-2.5.4.orig/Lib/distutils/command/build_scripts.py Python-2.5.4/Lib/distutils/command/build_scripts.py ---- Python-2.5.4.orig/Lib/distutils/command/build_scripts.py 2009-01-11 06:17:43.000000000 +0100 -+++ Python-2.5.4/Lib/distutils/command/build_scripts.py 2009-01-11 15:01:54.000000000 +0100 -@@ -54,15 +54,10 @@ +diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/build_scripts.py +index c0d8f70..d36e29c 100644 +--- a/Lib/distutils/command/build_scripts.py ++++ b/Lib/distutils/command/build_scripts.py +@@ -51,10 +51,7 @@ class build_scripts (Command): def copy_scripts (self): @@ -9,19 +10,20 @@ diff -ruN Python-2.5.4.orig/Lib/distutils/command/build_scripts.py Python-2.5.4/ - Python script in the Unix way (first line matches 'first_line_re', - ie. starts with "\#!" and contains "python"), then adjust the first - line to refer to the current Python interpreter as we copy. -- """ -+ """Copy each script listed in 'self.scripts'""" ++ """Copy each script listed in 'self.scripts'; + """ self.mkpath(self.build_dir) outfiles = [] - for script in self.scripts: -- adjust = 0 - script = convert_path(script) - outfile = os.path.join(self.build_dir, os.path.basename(script)) - outfiles.append(outfile) -@@ -86,34 +81,12 @@ - self.warn("%s is an empty file (skipping)" % script) - continue - +@@ -77,41 +74,9 @@ class build_scripts (Command): + if not self.dry_run: + raise + f = None +- else: +- first_line = f.readline() +- if not first_line: +- self.warn("%s is an empty file (skipping)" % script) +- continue +- - match = first_line_re.match(first_line) - if match: - adjust = 1 @@ -40,7 +42,8 @@ diff -ruN Python-2.5.4.orig/Lib/distutils/command/build_scripts.py Python-2.5.4/ - outf.write("#!%s%s\n" % - (os.path.join( - sysconfig.get_config_var("BINDIR"), -- "python" + sysconfig.get_config_var("EXE")), +- "python" + sysconfig.get_config_var("VERSION") +- + sysconfig.get_config_var("EXE")), - post_interp)) - outf.writelines(f.readlines()) - outf.close() @@ -52,9 +55,6 @@ diff -ruN Python-2.5.4.orig/Lib/distutils/command/build_scripts.py Python-2.5.4/ - self.copy_file(script, outfile) + if f: + f.close() -+ -+ log.info("copying %s -> %s", script, -+ self.build_dir) + self.copy_file(script, outfile) if os.name == 'posix': diff --git a/lang/pyyaml/Makefile b/lang/pyyaml/Makefile index 7f7db7a6b..6543fb94b 100644 --- a/lang/pyyaml/Makefile +++ b/lang/pyyaml/Makefile @@ -25,7 +25,7 @@ define Package/pyyaml CATEGORY:=Languages TITLE:=pyyaml URL:=http://pyyaml.org - DEPENDS:=python-core +libyaml + DEPENDS:=+python +libyaml endef define Package/pyyaml/description diff --git a/lang/telepathy-python/Makefile b/lang/telepathy-python/Makefile index 63a7f1808..028505610 100644 --- a/lang/telepathy-python/Makefile +++ b/lang/telepathy-python/Makefile @@ -24,7 +24,7 @@ define Package/telepathy-python CATEGORY:=Languages TITLE:=telepathy-python URL:=http://telepathy.freedesktop.org - DEPENDS:=python-core +dbus-python + DEPENDS:=+python-mini +dbus-python endef define Package/telepathy-python/description diff --git a/lang/twisted/Makefile b/lang/twisted/Makefile index 4acaac49e..89c8ee1c5 100644 --- a/lang/twisted/Makefile +++ b/lang/twisted/Makefile @@ -27,7 +27,7 @@ define Package/twisted/default SECTION:=lang CATEGORY:=Languages URL:=http://twistedmatrix.com/ - DEPENDS:=python-core + DEPENDS:=+python-mini endef define Package/twisted/default/description diff --git a/lang/xapian-bindings/Makefile b/lang/xapian-bindings/Makefile index a6c97a972..149d9f0cc 100644 --- a/lang/xapian-bindings/Makefile +++ b/lang/xapian-bindings/Makefile @@ -27,7 +27,7 @@ define Package/python-xapian SUBMENU:=Python TITLE:=xapian python bindings URL:=http://oligarchy.co.uk/xapian/ - DEPENDS:=python +libxapian + DEPENDS:=+python-mini +libxapian endef define Build/Configure diff --git a/lang/yapsnmp/Makefile b/lang/yapsnmp/Makefile index e60d11dce..215832459 100644 --- a/lang/yapsnmp/Makefile +++ b/lang/yapsnmp/Makefile @@ -29,7 +29,7 @@ define Package/python-yapsnmp CATEGORY:=Languages TITLE:=Python interface to Net-SNMP URL:=http://yapsnmp.sourceforge.net/ - DEPENDS:=python-core +libnetsnmp + DEPENDS:=+python-mini +libnetsnmp endef define Package/python-yapsnmp/description diff --git a/libs/libdnet/Makefile b/libs/libdnet/Makefile index 5c6406d6a..f842364cc 100644 --- a/libs/libdnet/Makefile +++ b/libs/libdnet/Makefile @@ -33,7 +33,7 @@ endef define Package/pydnet SECTION:=libs - DEPENDS:=libdnet python-core + DEPENDS:=libdnet +python-mini CATEGORY:=Libraries TITLE:=Low-level network library URL:=http://sourceforge.net/projects/libdnet/ diff --git a/utils/rdiff-backup/Makefile b/utils/rdiff-backup/Makefile index 5a2fc01dc..ebf84b1d1 100644 --- a/utils/rdiff-backup/Makefile +++ b/utils/rdiff-backup/Makefile @@ -27,7 +27,7 @@ define Package/rdiff-backup CATEGORY:=Languages TITLE:=Incremental backup utility URL:=http://www.nongnu.org/rdiff-backup - DEPENDS:=python-core +librsync +libpopt + DEPENDS:=+python-mini +librsync +libpopt endef define Package/rdiff-backup/description diff --git a/utils/rrdtool/Makefile b/utils/rrdtool/Makefile index ecff3ff3d..57f5f0c0e 100644 --- a/utils/rrdtool/Makefile +++ b/utils/rrdtool/Makefile @@ -54,7 +54,7 @@ $(call Package/rrdtool/Default) SECTION:=lang CATEGORY:=Languages TITLE+= python bindings (v1.2.x) - DEPENDS+= python-core +librrd + DEPENDS+= +python-mini +librrd endef CONFIGURE_ARGS += \