From 0ac7fa48ca863e87a7f31f61a28ec60ec5a0509b Mon Sep 17 00:00:00 2001 From: lars Date: Mon, 9 Mar 2009 02:02:37 +0000 Subject: [PATCH] The mercurial package was expecting 2.5 to be the used python version. Fix it by using the build templates provided by the python package. git-svn-id: svn://svn.openwrt.org/openwrt/packages@14801 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- net/mercurial/Makefile | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/net/mercurial/Makefile b/net/mercurial/Makefile index 4cad8a839..d8dd19b71 100644 --- a/net/mercurial/Makefile +++ b/net/mercurial/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006,2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -15,9 +15,10 @@ PKG_RELEASE:=1 PKG_SOURCE_URL:=http://selenic.com/mercurial/release/ PKG_SOURCE:=mercurial-$(PKG_VERSION).tar.gz PKG_MD5SUM:=4fd3b9a2e5dcd025840c3849b136bec8 -PKG_BUILD_DEPENDS:=python +PKG_BUILD_DEPENDS:=python-mini include $(INCLUDE_DIR)/package.mk +-include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk) define Package/mercurial SECTION:=net @@ -31,19 +32,10 @@ define Package/mercurial/description A fast, lightweight Source Control Management system designed for efficient handling of very large distributed projects. endef -HG_BUILDOPTS= \ - CC="$(TARGET_CC)" \ - LDSHARED="$(TARGET_CC) -shared" \ - CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/python2.5/" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib -lpython2.5" - define Build/Compile - (cd $(PKG_BUILD_DIR); \ - $(HG_BUILDOPTS) /usr/bin/python setup.py build; \ - ); - (cd $(PKG_BUILD_DIR); \ - /usr/bin/python setup.py install --prefix="$(PKG_INSTALL_DIR)"; \ - ); + $(call Build/Compile/PyMod,, \ + install --prefix="$(PKG_INSTALL_DIR)", \ + ) endef define Package/mercurial/install -- 2.11.0