[oe,meta-oe,v3] mercurial: Upgrade to 5.2 and switch to py3

Message ID 20191127072848.785911-2-raj.khem@gmail.com
State New
Headers show
Series
  • [oe,meta-oe,v3] mercurial: Upgrade to 5.2 and switch to py3
Related show

Commit Message

Khem Raj Nov. 27, 2019, 7:28 a.m.
Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
v2: Fix python path during target build
v3: Separate target specific do_install, since this was making native
    not work

 .../{mercurial_4.6.1.bb => mercurial_5.2.bb}  | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)
 rename meta-oe/recipes-devtools/mercurial/{mercurial_4.6.1.bb => mercurial_5.2.bb} (50%)

-- 
2.24.0

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-devtools/mercurial/mercurial_4.6.1.bb b/meta-oe/recipes-devtools/mercurial/mercurial_5.2.bb
similarity index 50%
rename from meta-oe/recipes-devtools/mercurial/mercurial_4.6.1.bb
rename to meta-oe/recipes-devtools/mercurial/mercurial_5.2.bb
index 13710aaea3..18ffb23d78 100644
--- a/meta-oe/recipes-devtools/mercurial/mercurial_4.6.1.bb
+++ b/meta-oe/recipes-devtools/mercurial/mercurial_5.2.bb
@@ -3,29 +3,36 @@  HOMEPAGE = "http://mercurial.selenic.com/"
 SECTION = "console/utils"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-DEPENDS = "python python-native"
-DEPENDS_class-native = "python-native"
-RDEPENDS_${PN} = "python python-modules"
 
-inherit python-dir
+DEPENDS = "python3 python3-native"
+DEPENDS_class-native = "python3-native"
+RDEPENDS_${PN} = "python3 python3-modules"
+
+inherit python3native
 
 SRC_URI = "https://www.mercurial-scm.org/release/${BP}.tar.gz"
-SRC_URI[md5sum] = "f9b2e4a3b5901ef744fa3abe4196e97e"
-SRC_URI[sha256sum] = "89fa8ecbc8aa6e48e98f9803a1683ba91367124295dba2407b28c34ca621108d"
+SRC_URI[md5sum] = "9ba9d59157c002db8d8cab680de08eb5"
+SRC_URI[sha256sum] = "ff030e923f03ee15c91191996fcb099bfcfa60c7df263be227f67b6a65d36194"
 
 S = "${WORKDIR}/mercurial-${PV}"
 
 BBCLASSEXTEND = "native"
 
+export LDSHARED="${CCLD} -shared"
+
 EXTRA_OEMAKE = "STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
     PREFIX=${prefix}"
 
 do_configure_append () {
-    sed -i -e 's:PYTHON=python:PYTHON=${STAGING_BINDIR_NATIVE}/python-native/python:g' ${S}/Makefile
+    sed -i -e 's:PYTHON?=python:PYTHON?=${STAGING_BINDIR_NATIVE}/python3-native/python3:g' ${S}/Makefile
 }
 
 do_install () {
     oe_runmake -e install-bin DESTDIR=${D} PREFIX=${prefix}
 }
+do_install_append_class-target () {
+    sed -i -e 's:${STAGING_BINDIR_NATIVE}/python3-native/python3:${USRBINPATH}/env python3:g' ${D}${bindir}/hg
+}
 
 FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}"
+