Patchwork [meta-oe] mercurial-native: fix install

login
register
mail settings
Submitter Eric BENARD
Date Nov. 12, 2012, 4:57 p.m.
Message ID <1352739431-26121-1-git-send-email-eric@eukrea.com>
Download mbox | patch
Permalink /patch/38877/
State Accepted
Commit e23c48c67e5cb6b6b85880559d0767469a25d42a
Headers show

Comments

Eric BENARD - Nov. 12, 2012, 4:57 p.m.
else host python is used leading to the following error if the host doesn't
have the python headers installed :
| Python headers are required to build Mercurial
| make: *** [build] Error 1

Signed-off-by: Eric BĂ©nard <eric@eukrea.com>
---
 .../mercurial/mercurial-native_1.9.bb              |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

Patch

diff --git a/meta-oe/recipes-devtools/mercurial/mercurial-native_1.9.bb b/meta-oe/recipes-devtools/mercurial/mercurial-native_1.9.bb
index facf554..41b29fb 100644
--- a/meta-oe/recipes-devtools/mercurial/mercurial-native_1.9.bb
+++ b/meta-oe/recipes-devtools/mercurial/mercurial-native_1.9.bb
@@ -4,7 +4,7 @@  SECTION = "console/utils"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "python-native"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://mercurial.selenic.com/release/mercurial-${PV}.tar.gz"
 SRC_URI[md5sum] = "d4842129fa2732eb6ed1180467bc32e2"
@@ -17,6 +17,10 @@  inherit native
 EXTRA_OEMAKE = "STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} PREFIX=${prefix}"
 
+do_configure_append () {
+        sed -i -e 's:PYTHON=python:PYTHON=${STAGING_BINDIR_NATIVE}/python-native/python:g' ${S}/Makefile
+}
+
 do_install () {
         oe_runmake -e install-bin DESTDIR=${D} PREFIX=${prefix}
 }