[packages] python: add a minimal python-mini package, remove readline support since it needs ncurses, fix optimization flags for extension building, add -expat and -openssl subpackages, cleanup

git-svn-id: svn://svn.openwrt.org/openwrt/packages@9207 3c298f89-4303-0410-b956-a3cf2f4a3e73

lang/python/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -15,110 +15,253 @@ PKG_RELEASE:=1
 PKG_SOURCE:=Python-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.python.org/ftp/python/$(PKG_VERSION)/
 PKG_MD5SUM:=70084ffa561660f07de466c2c8c4842d
-PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/Python-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+PKG_BUILD_DEPENDS:=libexpat libopenssl zlib
 
 include $(INCLUDE_DIR)/package.mk
+include ./python-package.mk
 
-PY_DISABLED_MODULES=\
+define PyPackage/python/Default
-	_curses _curses_panel _tkinter nis 
-
-define Package/python
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
-  DEPENDS:=+libexpat +libopenssl +libpthread +libreadline +uclibcxx
   TITLE:=Python 2.5 programming language
   URL:=http://www.python.org/
 endef
 
-define Package/python/description
+define PyPackage/python/Default/description
-Python programming language
+ Python is a dynamic object-oriented programming language that can be used 
-	Python is a dynamic object-oriented programming language that 
+ for many kinds of software development. It offers strong support for 
-	can be used for many kinds of software development. It offers 
+ integration with other languages and tools, comes with extensive standard 
-	strong support for integration with other languages and tools, 
+ libraries, and can be learned in a few days. Many Python programmers 
-	comes with extensive standard libraries, and can be learned in a 
+ report substantial productivity gains and feel the language encourages 
-	few days. Many Python programmers report substantial productivity 
+ the development of higher quality, more maintainable code.
-	gains and feel the language encourages the development of higher 
-	quality, more maintainable code.
 endef
 
-define Build/Configure
+define PyPackage/python
-	(cd $(PKG_BUILD_DIR); \
+$(call PyPackage/python/Default)
-		rm -rf config.cache; \
+ TITLE+= (full)
-		CONFIG_SITE= \
+ DEPENDS:= +libpthread +zlib
-		./configure --with-threads=no --with-cxx=no; \
+ PROVIDES:=python-core
-		$(MAKE) python Parser/pgen; \
-		mv python hostpython; \
-		mv Parser/pgen Parser/hostpgen; \
-		make distclean; \
-	);
-	$(call Build/Configure/Default, \
-		--disable-shared \
-		--with-cxx=no \
-		--sysconfdir=/etc \
-		--with-threads \
-		--disable-ipv6 \
-		HOSTPYTHON=./hostpython \
-		HOSTPGEN=./Parser/hostpgen \
-	)
 endef
 
+define PyPackage/python/description
+$(call PyPackage/python/Default/description)
+ .
+ This package contains the full Python install.
+endef
+
+define PyPackage/python-mini
+$(call PyPackage/python/Default)
+ TITLE+= (minimal)
+ DEPENDS:= +libpthread +zlib
+ PROVIDES:=python-core
+endef
+
+define PyPackage/python-mini/description
+$(call PyPackage/python/Default/description)
+ .
+ This package contains only a minimal Python install.
+endef
+
+define PyPackage/python-doc
+$(call PyPackage/python/Default)
+ TITLE:=Python interactive documentation
+endef
+
+define PyPackage/python-expat
+$(call PyPackage/python/Default)
+ TITLE:=Python support for expat
+ DEPENDS+= +libexpat
+endef
+
+define PyPackage/python-openssl
+$(call PyPackage/python/Default)
+ TITLE:=Python support for OpenSSL
+ DEPENDS+= +libopenssl
+endef
+
+
+PY_DISABLED_MODULES:= \
+	readline _curses _curses_panel _tkinter nis
+
 MAKE_OPTS:=\
 	$(TARGET_CONFIGURE_OPTS) \
-	PYTHON_MODULES_INCLUDE=$(STAGING_DIR)/include \
-	PYTHON_MODULES_LIB=$(STAGING_DIR)/lib \
 	PYTHON_DISABLE_MODULES="$(PY_DISABLED_MODULES)" \
+	PYTHON_MODULES_INCLUDE="$(STAGING_DIR)/usr/include" \
+	PYTHON_MODULES_LIB="$(STAGING_DIR)/usr/lib" \
+	CROSS_COMPILE=yes \
 	CFLAGS="$(TARGET_CFLAGS) -fno-inline" \
 	LDFLAGS="$(TARGET_LDFLAGS)" \
 	LD="$(TARGET_CC)" \
 	HOSTPYTHON=./hostpython \
-	HOSTPGEN=./Parser/hostpgen
+	HOSTPGEN=./hostpgen
+
+define Build/Configure
+endef
 
 define Build/Compile
+	-$(MAKE) -C $(PKG_BUILD_DIR) distclean
+	(cd $(PKG_BUILD_DIR); \
+		rm -rf config.cache; \
+		CONFIG_SITE= \
+		OPT="$(HOST_CFLAGS)" \
+		./configure --without-cxx-main --without-threads; \
+	);
+	$(MAKE) -C $(PKG_BUILD_DIR) python Parser/pgen
+	(cd $(PKG_BUILD_DIR); \
+		mv python ./hostpython; \
+		mv Parser/pgen ./hostpgen; \
+	);
+	$(MAKE) -C $(PKG_BUILD_DIR) distclean
+	#echo "readline readline.c -lreadline -lncurses" >> $(PKG_BUILD_DIR)/Modules/Setup.local
+	$(call Build/Configure/Default, \
+		--sysconfdir=/etc \
+		--disable-shared \
+		--disable-ipv6 \
+		--without-cxx-main \
+		--with-threads \
+		HOSTPYTHON=./hostpython \
+		HOSTPGEN=./hostpgen \
+		OPT="$(TARGET_CFLAGS)" \
+	)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(MAKE_OPTS) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS) -fno-inline" \
-		CROSS_COMPILE=yes \
 		all install
 endef
 
 define Build/InstallDev
 	mkdir -p $(1)/usr/bin
 	$(CP) $(PKG_BUILD_DIR)/hostpython $(1)/usr/bin/
-	mkdir -p $(1)/usr/include
+	ln -sf hostpython $(1)/usr/bin/python
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/python2.5 $(1)/usr/include/
+	mkdir -p $(STAGING_DIR)/usr/include
-	mkdir -p $(1)/usr/lib
+	$(CP)	$(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.5 $(1)/usr/lib/
+		$(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libpython2.5.a $(1)/usr/lib/python2.5/
+	mkdir -p $(STAGING_DIR)/usr/lib
+	$(CP)	$(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION) \
+		$(1)/usr/lib/
+	$(CP)	$(PKG_BUILD_DIR)/libpython$(PYTHON_VERSION).a \
+		$(1)/usr/lib/
 endef
 
 define Build/UninstallDev
 	rm -rf	$(STAGING_DIR)/usr/bin/hostpython \
-		$(STAGING_DIR)/usr/include/python2.5 \
+		$(STAGING_DIR)/usr/bin/python \
-		$(STAGING_DIR)/usr/lib/python2.5
+		$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION) \
+		$(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION) \
+		$(STAGING_DIR)/usr/lib/libpython$(PYTHON_VERSION).a
 endef
 
-define Package/python/install
+define PyPackage/python/filespec
-	$(INSTALL_DIR) $(1)/usr/bin
++|/usr/bin/python$(PYTHON_VERSION)
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/python2.5 $(1)/usr/bin/
++|/usr/lib/python$(PYTHON_VERSION)
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/python $(1)/usr/bin/
+-|/usr/lib/python$(PYTHON_VERSION)/bsddb/test
-	$(INSTALL_DIR) $(1)/usr/include/python2.5
+-|/usr/lib/python$(PYTHON_VERSION)/config
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/python2.5/Python.h $(1)/usr/include/python2.5/
+-|/usr/lib/python$(PYTHON_VERSION)/ctypes/test
-	$(INSTALL_DIR) $(1)/usr/lib
+-|/usr/lib/python$(PYTHON_VERSION)/distutils/command/wininst-*.exe
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.5 $(1)/usr/lib/
+-|/usr/lib/python$(PYTHON_VERSION)/distutils/tests
-	rm -rf	$(1)/usr/lib/python2.5/bsddb/test \
+-|/usr/lib/python$(PYTHON_VERSION)/email/test
-		$(1)/usr/lib/python2.5/distutils/tests \
+-|/usr/lib/python$(PYTHON_VERSION)/idlelib
-		$(1)/usr/lib/python2.5/email/test \
+-|/usr/lib/python$(PYTHON_VERSION)/lib-tk
-		$(1)/usr/lib/python2.5/idlelib \
+-|/usr/lib/python$(PYTHON_VERSION)/sqlite3/test
-		$(1)/usr/lib/python2.5/lib-tk \
+-|/usr/lib/python$(PYTHON_VERSION)/test
-		$(1)/usr/lib/python2.5/sqlite3/test \
-		$(1)/usr/lib/python2.5/ctypes/test \
-		$(1)/usr/lib/python2.5/test
-
 endef
 
-$(eval $(call BuildPackage,python))
+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
++|/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)/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)/linecache.py
++|/usr/lib/python$(PYTHON_VERSION)/md5.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
+endef
+
+define PyPackage/python-mini/install
+	ln -sf python$(PYTHON_VERSION) $(1)/usr/bin/python
+endef
+
+define PyPackage/python-pydoc/filespec
++|/usr/lib/python$(PYTHON_VERSION)/pydoc.py
+endef
+
+define PyPackage/python-expat/filespec
++|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/pyexpat.so
+endef
+
+define PyPackage/python-openssl/filespec
++|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_ssl.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-openssl))
+

lang/python/python-package.mk

@@ -8,12 +8,14 @@
 
 ifeq ($(DUMP),)
 
-  PYTHON:=$(STAGING_DIR)/usr/bin/hostpython
-
   PYTHON_VERSION=2.5
 
-  PYTHON_INC_DIR:=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION)
+  PYTHON_DIR:=$(STAGING_DIR)/usr
-  PYTHON_LIB_DIR:=$(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION)
+  PYTHON_BIN_DIR:=$(PYTHON_DIR)/bin
+  PYTHON_INC_DIR:=$(PYTHON_DIR)/include/python$(PYTHON_VERSION)
+  PYTHON_LIB_DIR:=$(PYTHON_DIR)/lib/python$(PYTHON_VERSION)
+
+  PYTHON:=$(PYTHON_BIN_DIR)/python
 
   PYTHON_PKG_DIR:=/usr/lib/python$(PYTHON_VERSION)/site-packages
 
@@ -28,7 +30,7 @@ define PyPackage
     TITLE:=$(TITLE)
     SECTION:=lang
     CATEGORY:=Languages
-    DEPENDS:=python
+    DEPENDS:=python-core
     $(call PyPackage/$(1))
   endef