[packages] python: ship pyconfig.h (#8032)

[openwrt/svn-archive/archive.git] / lang / python / Makefile

diff --git a/lang/python/Makefile b/lang/python/Makefile
index cdb40137c5c0409b522b9d9ef9fa7edb3a1675d7..8dfd95877b23cfc611cc83860f659ac081e70a41 100644 (file)
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python
-PKG_VERSION:=2.6.1
-PKG_RELEASE:=1
+PKG_VERSION:=2.6.4
+PKG_RELEASE:=3
 
 PKG_SOURCE:=Python-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.python.org/ftp/python/$(PKG_VERSION)/
-PKG_MD5SUM:=e81c2f0953aa60f8062c05a4673f2be0
+PKG_MD5SUM:=fee5408634a54e721a93531aba37f8c1
+PKG_BUILD_PARALLEL:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/Python-$(PKG_VERSION)
 
@@ -40,7 +41,7 @@ endef
 define Package/python
 $(call Package/python/Default)
   TITLE+= (full)
-  DEPENDS:=+libpthread +zlib +PACKAGE_python:libffi +python-mini
+  DEPENDS:=+libpthread +zlib +libffi +python-mini
 endef
 
 define Package/python/description
@@ -73,18 +74,35 @@ $(call Package/python/Default)
   DEPENDS+=+python-mini +libexpat
 endef
 
+define Package/python-gzip
+$(call Package/python/Default)
+  TITLE:=Python support for gzip
+  DEPENDS+=+python-mini
+endef
+
 define Package/python-openssl
 $(call Package/python/Default)
  TITLE:=Python support for OpenSSL
  DEPENDS+=+python-mini +libopenssl
 endef
 
+define Package/python-shutil
+$(call Package/python/Default)
+  TITLE:=Python support for shutil
+  DEPENDS+=+python-mini
+endef
+
 define Package/python-sqlite3
 $(call Package/python/Default)
  TITLE:=Python support for sqlite3
  DEPENDS+=+python-mini +libsqlite3
 endef
 
+define Package/python-gdbm
+$(call Package/python/Default)
+ TITLE:=Python support for gdbm
+ DEPENDS+=+python-mini +libgdbm
+endef
 
 PY_DISABLED_MODULES:= \
        readline _curses _curses_panel _tkinter nis
@@ -113,11 +131,14 @@ define Build/Compile
                OPT="$(HOST_CFLAGS)" \
                ./configure --without-cxx-main --without-threads --prefix=$(PKG_INSTALL_DIR)/host; \
        );
-       $(MAKE) -C $(PKG_BUILD_DIR) \
+       $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
                python Parser/pgen
+       $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+               HOSTPYTHON=$(PKG_BUILD_DIR)/python \
+               sharedmods
        $(MAKE) -C $(PKG_BUILD_DIR) \
                HOSTPYTHON=$(PKG_BUILD_DIR)/python \
-               sharedmods install
+               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.
@@ -126,7 +147,6 @@ define Build/Compile
        $(call Build/Configure/Default, \
                --sysconfdir=/etc \
                --disable-shared \
-               --disable-ipv6 \
                --without-cxx-main \
                --with-threads \
                --with-system-ffi \
@@ -136,10 +156,14 @@ define Build/Compile
                ac_cv_py_format_size_t=no \
                OPT="$(TARGET_CFLAGS)" \
        )
+       $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+               $(MAKE_OPTS) \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               all
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(MAKE_OPTS) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
+               install
 endef
 
 define Build/InstallDev
@@ -174,7 +198,6 @@ define Build/InstallDev
 endef
 
 define PyPackage/python/filespec
-+|/usr/bin/python$(PYTHON_VERSION)
 +|/usr/lib/python$(PYTHON_VERSION)
 -|/usr/lib/python$(PYTHON_VERSION)/bsddb/test
 -|/usr/lib/python$(PYTHON_VERSION)/config
@@ -190,6 +213,7 @@ define PyPackage/python/filespec
 -|/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/gdbm.so
 -|/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
@@ -220,9 +244,13 @@ define PyPackage/python/filespec
 -|/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/_md5.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/_sha.so
+-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_sha256.so
+-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_sha512.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
@@ -270,10 +298,6 @@ define PyPackage/python/filespec
 -|/usr/lib/python$(PYTHON_VERSION)/weakref.py
 endef
 
-define PyPackage/python/install
-       ln -sf python$(PYTHON_VERSION) $(1)/usr/bin/python
-endef
-
 define PyPackage/python-mini/filespec
 +|/usr/bin/python$(PYTHON_VERSION)
 +|/usr/lib/python$(PYTHON_VERSION)/__future__.py
@@ -299,9 +323,13 @@ define PyPackage/python-mini/filespec
 +|/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/_md5.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/_sha.so
++|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_sha256.so
++|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_sha512.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
@@ -347,6 +375,7 @@ define PyPackage/python-mini/filespec
 +|/usr/lib/python$(PYTHON_VERSION)/UserDict.py
 +|/usr/lib/python$(PYTHON_VERSION)/warnings.py
 +|/usr/lib/python$(PYTHON_VERSION)/weakref.py
++|/usr/include/python$(PYTHON_VERSION)/pyconfig.h
 endef
 
 define PyPackage/python-mini/install
@@ -362,18 +391,43 @@ define PyPackage/python-expat/filespec
 +|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/pyexpat.so
 endef
 
+define PyPackage/python-gzip/filespec
++|/usr/lib/python$(PYTHON_VERSION)/gzip.py
+endef
+
 define PyPackage/python-openssl/filespec
 +|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_ssl.so
 endef
 
+define PyPackage/python-shutil/filespec
++|/usr/lib/python$(PYTHON_VERSION)/shutil.py
+endef
+
+define PyPackage/python-sqlite3/filespec
++|/usr/lib/python$(PYTHON_VERSION)/sqlite3
++|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_sqlite3.so
+endef
+
+define PyPackage/python-gdbm/filespec
++|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/gdbm.so
+endef
+
 $(eval $(call PyPackage,python))
 $(eval $(call PyPackage,python-mini))
 $(eval $(call PyPackage,python-doc))
 $(eval $(call PyPackage,python-expat))
+$(eval $(call PyPackage,python-gzip))
 $(eval $(call PyPackage,python-openssl))
+$(eval $(call PyPackage,python-shutil))
+$(eval $(call PyPackage,python-sqlite3))
+$(eval $(call PyPackage,python-gdbm))
 
 $(eval $(call BuildPackage,python))
 $(eval $(call BuildPackage,python-mini))
 $(eval $(call BuildPackage,python-doc))
 $(eval $(call BuildPackage,python-expat))
+$(eval $(call BuildPackage,python-gzip))
 $(eval $(call BuildPackage,python-openssl))
+$(eval $(call BuildPackage,python-shutil))
+$(eval $(call BuildPackage,python-sqlite3))
+$(eval $(call BuildPackage,python-gdbm))