[packages] openh323: remove useless package dependencies and add build-time dependenc...

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

diff --git a/lang/python/Makefile b/lang/python/Makefile
index ff559a31e9f17cfc2685d370a25fbee2c9dd870c..c183445a36159641f667a96b8768d1022bd3e774 100644 (file)
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python
-PKG_VERSION:=2.5
-PKG_RELEASE:=4
+PKG_VERSION:=2.5.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=Python-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.python.org/ftp/python/2.5/
-PKG_MD5SUM:=ddb7401e711354ca83b7842b733825a3
+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)
@@ -22,13 +22,14 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
-PY_DISABLED_MODULES=pyexpat dbm gdbm bsddb \
-       _curses _curses_panel _tkinter nis zipfile
+PY_DISABLED_MODULES=\
+       _curses _curses_panel _tkinter nis 
 
 define Package/python
+  SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
-  DEPENDS:=+uclibcxx +libpthread +libreadline +libncurses
+  DEPENDS:=+libexpat +libopenssl +libpthread +libreadline +uclibcxx
   TITLE:=Python 2.5 programming language
   URL:=http://www.python.org/
 endef
@@ -66,18 +67,17 @@ define Build/Configure
 endef
 
 MAKE_OPTS:=\
-               $(TARGET_CONFIGURE_OPTS) \
-               PYTHON_MODULES_INCLUDE=$(STAGING_DIR)/include \
-               PYTHON_MODULES_LIB=$(STAGING_DIR)/lib \
-               PYTHON_DISABLE_MODULES="$(PY_DISABLED_MODULES)" \
-               CFLAGS="$(TARGET_CFLAGS) -fno-inline" \
-               LDFLAGS="$(TARGET_LDFLAGS) -lncurses" \
-               LD="$(TARGET_CC)" \
-               HOSTPYTHON=./hostpython \
-               HOSTPGEN=./Parser/hostpgen
+       $(TARGET_CONFIGURE_OPTS) \
+       PYTHON_MODULES_INCLUDE=$(STAGING_DIR)/include \
+       PYTHON_MODULES_LIB=$(STAGING_DIR)/lib \
+       PYTHON_DISABLE_MODULES="$(PY_DISABLED_MODULES)" \
+       CFLAGS="$(TARGET_CFLAGS) -fno-inline" \
+       LDFLAGS="$(TARGET_LDFLAGS)" \
+       LD="$(TARGET_CC)" \
+       HOSTPYTHON=./hostpython \
+       HOSTPGEN=./Parser/hostpgen
 
 define Build/Compile
-       export PYTHON_DISABLE_SSL=1
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(MAKE_OPTS) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
@@ -87,32 +87,37 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/bin
-       $(CP) $(PKG_BUILD_DIR)/hostpython $(STAGING_DIR)/usr/bin/
-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/python2.5 $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.5 $(STAGING_DIR)/usr/lib/
+       mkdir -p $(1)/usr/bin
+       $(CP) $(PKG_BUILD_DIR)/hostpython $(1)/usr/bin/
+       mkdir -p $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/python2.5 $(1)/usr/include/
+       mkdir -p $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.5 $(1)/usr/lib/
+       $(CP) $(PKG_BUILD_DIR)/libpython2.5.a $(1)/usr/lib/python2.5/
 endef
 
 define Build/UninstallDev
-       rm -rf \
-               $(STAGING_DIR)/usr/{include,lib}/python2.5
+       rm -rf  $(STAGING_DIR)/usr/bin/hostpython \
+               $(STAGING_DIR)/usr/include/python2.5 \
+               $(STAGING_DIR)/usr/lib/python2.5
 endef
 
 define Package/python/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/python2.5 $(1)/usr/bin/
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/python $(1)/usr/bin/
+       $(INSTALL_DIR) $(1)/usr/include/python2.5
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/python2.5/Python.h $(1)/usr/include/python2.5/
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.5 $(1)/usr/lib/
-       rm -rf \
-               $(1)/usr/lib/python2.5/bsddb/test \
+       rm -rf  $(1)/usr/lib/python2.5/bsddb/test \
                $(1)/usr/lib/python2.5/distutils/tests \
                $(1)/usr/lib/python2.5/email/test \
                $(1)/usr/lib/python2.5/idlelib \
                $(1)/usr/lib/python2.5/lib-tk \
-               $(1)/usr/lib/python2.5/test \
+               $(1)/usr/lib/python2.5/sqlite3/test \
+               $(1)/usr/lib/python2.5/ctypes/test \
+               $(1)/usr/lib/python2.5/test
 
 endef