bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The mercurial package was expecting 2.5 to be the used python version. Fix it by

Browse Source 
using the build templates provided by the python package.


git-svn-id: svn://svn.openwrt.org/openwrt/packages@14801 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
lars 2009-03-09 02:02:37 +00:00
parent d276529193
commit 0ac7fa48ca
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
net/mercurial/Makefile
View File

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -15,9 +15,10 @@ PKG_RELEASE:=1
PKG_SOURCE_URL:=http://selenic.com/mercurial/release/ PKG_SOURCE_URL:=http://selenic.com/mercurial/release/
PKG_SOURCE:=mercurial-$(PKG_VERSION).tar.gz PKG_SOURCE:=mercurial-$(PKG_VERSION).tar.gz
PKG_MD5SUM:=4fd3b9a2e5dcd025840c3849b136bec8 PKG_MD5SUM:=4fd3b9a2e5dcd025840c3849b136bec8
PKG_BUILD_DEPENDS:=python PKG_BUILD_DEPENDS:=python-mini
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
-include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
define Package/mercurial define Package/mercurial
SECTION:=net 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. A fast, lightweight Source Control Management system designed for efficient handling of very large distributed projects.
endef 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 define Build/Compile
(cd $(PKG_BUILD_DIR); \ $(call Build/Compile/PyMod,, \
$(HG_BUILDOPTS) /usr/bin/python setup.py build; \ install --prefix="$(PKG_INSTALL_DIR)", \
); )
(cd $(PKG_BUILD_DIR); \
/usr/bin/python setup.py install --prefix="$(PKG_INSTALL_DIR)"; \
);
endef endef
define Package/mercurial/install define Package/mercurial/install