projects / openwrt / svn-archive / archive.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[packages] licensing: Licensing metadata added to many packages
[openwrt/svn-archive/archive.git] / lang / python / Makefile
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 9a48e80ce71563f1ddd445cac4a1a6093978f9db..e17740f68d898ecfbc9870d689a9d90d35d72716 100644 (file)
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python
-PKG_VERSION:=2.6.4
-PKG_RELEASE:=3
+PKG_VERSION:=2.7.3
+PKG_RELEASE:=1
 
-PKG_SOURCE:=Python-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.python.org/ftp/python/$(PKG_VERSION)/
-PKG_MD5SUM:=fee5408634a54e721a93531aba37f8c1
+PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=http://www.python.org/ftp/python/$(PKG_VERSION)
+PKG_MD5SUM:=62c4c1699170078c469f79ddfed21bc0
+
+PKG_LICENSE:=PSF
+PKG_LICENSE_FILES:=LICENSE Modules/_ctypes/libffi_msvc/LICENSE Modules/_ctypes/darwin/LICENSE Modules/_ctypes/libffi/LICENSE Modules/_ctypes/libffi_osx/LICENSE Tools/pybench/LICENSE
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
@@ -75,6 +78,12 @@ $(call Package/python/Default)
   DEPENDS+=+python-mini
 endef
 
+define Package/python-bzip2
+$(call Package/python/Default)
+  TITLE:=Python support for Bzip2
+  DEPENDS+=+python-mini +libbz2
+endef
+
 define Package/python-expat
 $(call Package/python/Default)
   TITLE:=Python support for expat
@@ -99,10 +108,11 @@ $(call Package/python/Default)
   DEPENDS+=+python-mini
 endef
 
+# Needs datetime
 define Package/python-sqlite3
 $(call Package/python/Default)
  TITLE:=Python support for sqlite3
- DEPENDS+=+python-mini +libsqlite3
+ DEPENDS+=+python +libsqlite3
 endef
 
 define Package/python-gdbm
@@ -111,39 +121,52 @@ $(call Package/python/Default)
  DEPENDS+=+python-mini +libgdbm
 endef
 
-PY_DISABLED_MODULES:= \
-       readline _curses _curses_panel _tkinter nis
+define Package/python-readline
+$(call Package/python/Default)
+ TITLE:=Python support for readline
+ DEPENDS+=+python-mini +libreadline +libncurses @BROKEN
+endef
+
+define Package/python-ncurses
+$(call Package/python/Default)
+ TITLE:=Python support for readline
+ DEPENDS+=+python-mini +libncurses
+endef
 
 MAKE_FLAGS:=\
        $(TARGET_CONFIGURE_OPTS) \
-       PYTHON_DISABLE_MODULES="$(PY_DISABLED_MODULES)" \
-       PYTHON_MODULES_INCLUDE="$(STAGING_DIR)/usr/include" \
-       PYTHON_MODULES_LIB="$(STAGING_DIR)/usr/lib" \
        DESTDIR="$(PKG_INSTALL_DIR)" \
        CROSS_COMPILE=yes \
-       CFLAGS="$(TARGET_CFLAGS) -fno-inline" \
+       CFLAGS="$(TARGET_CFLAGS) -DNDEBUG -fno-inline" \
        LDFLAGS="$(TARGET_LDFLAGS)" \
        LD="$(TARGET_CC)" \
        HOSTPYTHON=./hostpython \
        HOSTPGEN=./hostpgen
 
+ENABLE_IPV6:=
+ifeq ($(CONFIG_IPV6),y)
+       ENABLE_IPV6 += --enable-ipv6
+endif
+
 define Build/Configure
        -$(MAKE) -C $(PKG_BUILD_DIR) distclean
        (cd $(PKG_BUILD_DIR); autoreconf --force --install || exit 0)
        # The python executable needs to stay in the rootdir since its location will
        # be used to compute the path of the config files.
        $(CP) $(STAGING_DIR_HOST)/bin/pgen $(PKG_BUILD_DIR)/hostpgen
-       $(CP) $(STAGING_DIR_HOST)/bin/python $(PKG_BUILD_DIR)/hostpython
+       $(CP) $(STAGING_DIR_HOST)/bin/python$(PYTHON_VERSION) $(PKG_BUILD_DIR)/hostpython
        $(call Build/Configure/Default, \
                --sysconfdir=/etc \
                --disable-shared \
                --without-cxx-main \
                --with-threads \
-               --with-system-ffi \
-               ac_cv_lib_readline_readline=no \
+               --with-system-ffi="$(STAGING_DIR)/usr" \
+               $(ENABLE_IPV6) \
                ac_cv_have_chflags=no \
                ac_cv_have_lchflags=no \
                ac_cv_py_format_size_t=no \
+               ac_cv_have_long_long_format=yes \
+               ac_cv_buggy_getaddrinfo=no \
                OPT="$(TARGET_CFLAGS)" \
        )
 endef
@@ -164,7 +187,7 @@ define Build/InstallDev
                $(1)/usr/lib/python$(PYTHON_VERSION)/
 
        $(CP) \
-               $(STAGING_DIR_HOST)/bin/python \
+               $(STAGING_DIR_HOST)/bin/python$(PYTHON_VERSION) \
                $(1)/usr/bin/hostpython
        (cd $(2)/bin; \
        ln -sf ../../usr/bin/hostpython python$(PYTHON_VERSION); \
@@ -183,7 +206,6 @@ define PyPackage/python/filespec
 +|/usr/lib/python$(PYTHON_VERSION)
 -|/usr/lib/python$(PYTHON_VERSION)/bsddb/test
 -|/usr/lib/python$(PYTHON_VERSION)/config
-+|/usr/lib/python$(PYTHON_VERSION)/config/Makefile
 -|/usr/lib/python$(PYTHON_VERSION)/ctypes/test
 -|/usr/lib/python$(PYTHON_VERSION)/distutils/command/wininst-*.exe
 -|/usr/lib/python$(PYTHON_VERSION)/distutils/tests
@@ -195,11 +217,12 @@ 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/bz2.so
 -|/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
--|/usr/lib/python$(PYTHON_VERSION)/pydoc_topics.py
+-|/usr/lib/python$(PYTHON_VERSION)/pydoc_data
 -|/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
@@ -222,6 +245,10 @@ define PyPackage/python/filespec
 -|/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/_curses.so
+-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_curses_panel.so
+-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/dbm.so
+-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_bsddb.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
@@ -229,6 +256,7 @@ define PyPackage/python/filespec
 -|/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/readline.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
@@ -239,7 +267,6 @@ define PyPackage/python/filespec
 -|/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/_weakref.so
 -|/usr/lib/python$(PYTHON_VERSION)/linecache.py
 -|/usr/lib/python$(PYTHON_VERSION)/md5.py
 -|/usr/lib/python$(PYTHON_VERSION)/new.py
@@ -277,6 +304,17 @@ define PyPackage/python/filespec
 -|/usr/lib/python$(PYTHON_VERSION)/UserDict.py
 -|/usr/lib/python$(PYTHON_VERSION)/warnings.py
 -|/usr/lib/python$(PYTHON_VERSION)/weakref.py
+-|/usr/lib/python$(PYTHON_VERSION)/_weakrefset.py
+-|/usr/lib/python$(PYTHON_VERSION)/sysconfig.py
+-|/usr/lib/python$(PYTHON_VERSION)/functools.py
+-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_functools.so
+-|/usr/lib/python$(PYTHON_VERSION)/collections.py
+-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_collections.so
+-|/usr/lib/python$(PYTHON_VERSION)/keyword.py
+-|/usr/lib/python$(PYTHON_VERSION)/heapq.py
+-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_heapq.so
+-|/usr/lib/python$(PYTHON_VERSION)/bisect.py
+-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_bisect.so
 endef
 
 define PyPackage/python-mini/filespec
@@ -317,7 +355,6 @@ define PyPackage/python-mini/filespec
 +|/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/_weakref.so
 +|/usr/lib/python$(PYTHON_VERSION)/linecache.py
 +|/usr/lib/python$(PYTHON_VERSION)/md5.py
 +|/usr/lib/python$(PYTHON_VERSION)/new.py
@@ -355,6 +392,18 @@ 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/lib/python$(PYTHON_VERSION)/_weakrefset.py
++|/usr/lib/python$(PYTHON_VERSION)/config/Makefile
++|/usr/lib/python$(PYTHON_VERSION)/sysconfig.py
++|/usr/lib/python$(PYTHON_VERSION)/functools.py
++|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_functools.so
++|/usr/lib/python$(PYTHON_VERSION)/collections.py
++|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_collections.so
++|/usr/lib/python$(PYTHON_VERSION)/keyword.py
++|/usr/lib/python$(PYTHON_VERSION)/heapq.py
++|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_heapq.so
++|/usr/lib/python$(PYTHON_VERSION)/bisect.py
++|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_bisect.so
 +|/usr/include/python$(PYTHON_VERSION)/pyconfig.h
 endef
 
@@ -363,10 +412,14 @@ 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_data
 +|/usr/lib/python$(PYTHON_VERSION)/pydoc.py
 endef
 
+define PyPackage/python-bzip2/filespec
++|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/bz2.so
+endef
+
 define PyPackage/python-expat/filespec
 +|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/pyexpat.so
 endef
@@ -392,6 +445,15 @@ define PyPackage/python-gdbm/filespec
 +|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/gdbm.so
 endef
 
+define PyPackage/python-readline/filespec
++|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/readline.so
+endef
+
+define PyPackage/python-ncurses/filespec
++|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_curses.so
++|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_curses_panel.so
+endef
+
 define Host/Configure
        -$(MAKE) -C $(HOST_BUILD_DIR) distclean
        (cd $(HOST_BUILD_DIR); autoreconf --force --install || exit 0)
@@ -404,9 +466,9 @@ define Host/Configure
 endef
 
 define Host/Compile
-       $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
+       +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
                python Parser/pgen
-       $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
+       +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
                HOSTPYTHON=$(HOST_BUILD_DIR)/python \
                sharedmods
 endef
@@ -425,19 +487,25 @@ $(eval $(call HostBuild))
 $(eval $(call PyPackage,python))
 $(eval $(call PyPackage,python-mini))
 $(eval $(call PyPackage,python-doc))
+$(eval $(call PyPackage,python-bzip2))
 $(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 PyPackage,python-readline))
+$(eval $(call PyPackage,python-ncurses))
 
 $(eval $(call BuildPackage,python))
 $(eval $(call BuildPackage,python-mini))
 $(eval $(call BuildPackage,python-doc))
+$(eval $(call BuildPackage,python-bzip2))
 $(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))
+$(eval $(call BuildPackage,python-readline))
+$(eval $(call BuildPackage,python-ncurses))
OpenWrt SVN history