By using the python3targetconfig class we can drop the existing python patch and the extra make parameters.
Signed-off-by: Richard Purdie <[email protected]> --- .../libcap-ng/libcap-ng-python_0.8.2.bb | 3 +- meta/recipes-support/libcap-ng/libcap-ng.inc | 1 - .../libcap-ng/libcap-ng/python.patch | 58 ------------------- 3 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 meta/recipes-support/libcap-ng/libcap-ng/python.patch diff --git a/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb b/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb index 43f76dc561a..6cea422d113 100644 --- a/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb +++ b/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb @@ -4,14 +4,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/libcap-ng:" SUMMARY .= " - python" -inherit lib_package autotools python3native +inherit lib_package autotools python3targetconfig DEPENDS += "libcap-ng python3 swig-native" S = "${WORKDIR}/libcap-ng-${PV}" EXTRA_OECONF += "--with-python --with-python3" -EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}${PYTHON_ABI}' PYINC='${STAGING_INCDIR}/${PYLIBVER}'" do_install_append() { rm -rf ${D}${bindir} diff --git a/meta/recipes-support/libcap-ng/libcap-ng.inc b/meta/recipes-support/libcap-ng/libcap-ng.inc index 016d8e51746..64bc62de241 100644 --- a/meta/recipes-support/libcap-ng/libcap-ng.inc +++ b/meta/recipes-support/libcap-ng/libcap-ng.inc @@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ SRC_URI = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \ file://determinism.patch \ - file://python.patch \ " SRC_URI[sha256sum] = "52c083b77c2b0d8449dee141f9c3eba76e6d4c5ad44ef05df25891126cb85ae9" diff --git a/meta/recipes-support/libcap-ng/libcap-ng/python.patch b/meta/recipes-support/libcap-ng/libcap-ng/python.patch deleted file mode 100644 index 8db03ca31fe..00000000000 --- a/meta/recipes-support/libcap-ng/libcap-ng/python.patch +++ /dev/null @@ -1,58 +0,0 @@ -Subject: [PATCH] configure.ac - Avoid an incorrect check for python. - Makefile.am - avoid hard coded host include paths. - -Upstream-Status: pending - -Signed-off-by: Mark Hatle <[email protected]> -Signed-off-by: Li Xin <[email protected]> -Signed-off-by: Yi Zhao <[email protected]> -Signed-off-by: Zang Ruochen <[email protected]> - ---- - bindings/python/Makefile.am | 4 +++- - configure.ac | 17 ++--------------- - 2 files changed, 5 insertions(+), 16 deletions(-) - -Index: libcap-ng-0.8.2/bindings/python/Makefile.am -=================================================================== ---- libcap-ng-0.8.2.orig/bindings/python/Makefile.am -+++ libcap-ng-0.8.2/bindings/python/Makefile.am -@@ -23,7 +23,9 @@ - SUBDIRS = test - CONFIG_CLEAN_FILES = *.loT *.rej *.orig - AM_CFLAGS = -fPIC -DPIC --AM_CPPFLAGS = -I. -I$(top_builddir) -I@PYINCLUDEDIR@ -+PYLIBVER ?= python$(PYTHON_VERSION) -+PYINC ?= /usr/include/$(PYLIBVER) -+AM_CPPFLAGS = -I. -I$(top_builddir) -I$(PYINC) - SWIG_FLAGS = -python - SWIG_INCLUDES = ${AM_CPPFLAGS} - pyexec_PYTHON = capng.py -Index: libcap-ng-0.8.2/configure.ac -=================================================================== ---- libcap-ng-0.8.2.orig/configure.ac -+++ libcap-ng-0.8.2/configure.ac -@@ -169,21 +169,8 @@ fi - - # Setup Python2 with the interpreter found previously. - AM_PATH_PYTHON --PYINCLUDEDIR=`python${am_cv_python_version} -c "from distutils import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))"` --if test -f ${PYINCLUDEDIR}/Python.h ; then -- python_found="yes" -- AC_SUBST(PYINCLUDEDIR) -- pybind_dir="python" -- AC_SUBST(pybind_dir) -- AC_MSG_NOTICE(Python bindings will be built) --else -- python_found="no" -- if test "x$use_python" = xyes ; then -- AC_MSG_ERROR([Python explicitly requested and python headers were not found]) -- else -- AC_MSG_WARN("Python headers not found - python bindings will not be made") -- fi --fi -+python_found="yes" -+AC_MSG_NOTICE(Python bindings will be built) - fi - AM_CONDITIONAL(HAVE_PYTHON, test ${python_found} = "yes") - -- 2.27.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#148409): https://lists.openembedded.org/g/openembedded-core/message/148409 Mute This Topic: https://lists.openembedded.org/mt/80811238/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
