From a3c7ba37f1ccb126431bd6fdbc6130a7f3bf49cb Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Fri, 8 May 2020 13:49:04 +0800
Subject: [PATCH] libcomps: add support for python2
libcomps is required by dnf, and the python2 support is needed
after adding python2 support for dnf.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Babak Sarashki <Babak.SarAshki@windriver.com>
---
.../libcomps/libcomps_git.bbappend | 42 +++++++++++++++++++
1 file changed, 42 insertions(+)
create mode 100644 meta-stx-integ/recipes-devtools/libcomps/libcomps_git.bbappend
diff --git a/meta-stx-integ/recipes-devtools/libcomps/libcomps_git.bbappend b/meta-stx-integ/recipes-devtools/libcomps/libcomps_git.bbappend
new file mode 100644
index 0000000..1206385
--- /dev/null
+++ b/meta-stx-integ/recipes-devtools/libcomps/libcomps_git.bbappend
@@ -0,0 +1,42 @@
+DEPENDS += "\
+ python-native \
+ "
+
+EXTRA_OECMAKE_PY2 = " \
+ -DPYTHON_DESIRED=2 \
+ -DPYTHON_INSTALL_DIR=${libdir}/python2.7/site-packages \
+ -DPYTHON_EXECUTABLE=${STAGING_BINDIR_NATIVE}/python-native/python \
+ "
+
+do_configure_append() {
+ rm -rf ${B}/build-py2
+ mkdir -p ${B}/build-py2
+ cd ${B}/build-py2
+
+ cmake \
+ ${OECMAKE_GENERATOR_ARGS} \
+ $oecmake_sitefile \
+ ${OECMAKE_SOURCEPATH} \
+ -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
+ -DCMAKE_INSTALL_SO_NO_EXE=0 \
+ -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
+ -DCMAKE_NO_SYSTEM_FROM_IMPORTED=1 \
+ ${EXTRA_OECMAKE_PY2} \
+ -Wno-dev
+}
+
+cmake_runcmake_build_py2() {
+ bbnote ${DESTDIR:+DESTDIR=${DESTDIR} }VERBOSE=1 cmake --build '${B}/build-py2' "$@" -- ${EXTRA_OECMAKE_BUILD}
+ eval ${DESTDIR:+DESTDIR=${DESTDIR} }VERBOSE=1 cmake --build '${B}/build-py2' "$@" -- ${EXTRA_OECMAKE_BUILD}
+}
+
+do_compile_append() {
+ cd ${B}/build-py2
+ cmake_runcmake_build_py2 --target ${OECMAKE_TARGET_COMPILE}
+}
+
+do_install_append() {
+ cd ${B}/build-py2
+ DESTDIR='${D}' cmake_runcmake_build_py2 --target ${OECMAKE_TARGET_INSTALL}
+}
+