[PATCH 1/3] cxxtest: move to setuptools

* [PATCH 1/3] cxxtest: move to setuptools
@ 2022-01-14 11:52 Ross Burton
  2022-01-14 11:52 ` [PATCH 2/3] iotop: move to the C port of iotop Ross Burton
  2022-01-14 11:52 ` [PATCH 3/3] pyxdg: upgrade and remove distutils Ross Burton
  0 siblings, 2 replies; 6+ messages in thread
From: Ross Burton @ 2022-01-14 11:52 UTC (permalink / raw)
  To: openembedded-devel

setup.py has always supported setuptools, so change the inherit now that
distutils is deprecated.

Leave S as the top of the source tree, and set SETUPUTILS_SETUP_PATH
to find the setup.py.

Fix the hashbang in cxxtestgen, which was still pointing at python not
python3.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb b/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb
index b760690652..65b54ed548 100644
--- a/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb
+++ b/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb
@@ -2,21 +2,22 @@ DESCRIPTION = "CxxTest is a unit testing framework for C++ that is similar in sp
 HOMEPAGE = "http://cxxtest.com/"
 SECTION = "devel"
 LICENSE = "LGPL-2.0"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/cxxtest-${PV}/COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
-SRC_URI = "http://downloads.sourceforge.net/project/cxxtest/cxxtest/${PV}/cxxtest-${PV}.tar.gz"
+SRC_URI = "http://downloads.sourceforge.net/project/cxxtest/cxxtest/${PV}/${BP}.tar.gz"
 SRC_URI[md5sum] = "c3cc3355e2ac64e34c215f28e44cfcec"
 SRC_URI[sha256sum] = "1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f4895cf7d8"
 
-S = "${WORKDIR}/cxxtest-${PV}/python"
+inherit setuptools3
 
-inherit distutils3
+SETUPTOOLS_SETUP_PATH = "${S}/python"
 
 do_install:append() {
     install -d ${D}${includedir}
-    cp -a ../cxxtest ${D}${includedir}
+    cp -a ${S}/cxxtest/ ${D}${includedir}
+    # Fix the interpretter as otherwise this points to the build host python
     sed '1c\
-#!/usr/bin/env python' -i ${D}${bindir}/cxxtestgen
+#!/usr/bin/env python3' -i ${D}${bindir}/cxxtestgen
 }
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.25.1



^ permalink raw reply related	[flat|nested] 6+ messages in thread