mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 00:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

libcap-ng: Replace python patch with a better fix

Browse Source 
By using the python3targetconfig class we can drop the existing python
patch and the extra make parameters.

(From OE-Core rev: 3bbebc39235f50af4d66e3284b67c1491d2c93f2)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2021-02-20 15:08:04 +00:00
parent e1767e1287
commit b567f5f59e
3 changed files with 1 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb
View File

@@ -4,14 +4,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/libcap-ng:"
SUMMARY .= " - python" SUMMARY .= " - python"
inherit lib_package autotools python3native inherit lib_package autotools python3targetconfig
DEPENDS += "libcap-ng python3 swig-native" DEPENDS += "libcap-ng python3 swig-native"
S = "${WORKDIR}/libcap-ng-${PV}" S = "${WORKDIR}/libcap-ng-${PV}"
EXTRA_OECONF += "--with-python --with-python3" EXTRA_OECONF += "--with-python --with-python3"
EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}${PYTHON_ABI}' PYINC='${STAGING_INCDIR}/${PYLIBVER}'"
do_install_append() { do_install_append() {
rm -rf ${D}${bindir} rm -rf ${D}${bindir}

1
meta/recipes-support/libcap-ng/libcap-ng.inc
View File

@@ -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 \ SRC_URI = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \
file://determinism.patch \ file://determinism.patch \
file://python.patch \
" "
SRC_URI[sha256sum] = "52c083b77c2b0d8449dee141f9c3eba76e6d4c5ad44ef05df25891126cb85ae9" SRC_URI[sha256sum] = "52c083b77c2b0d8449dee141f9c3eba76e6d4c5ad44ef05df25891126cb85ae9"

58
meta/recipes-support/libcap-ng/libcap-ng/python.patch
View File

@@ -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 <mark.hatle@windriver.com>
Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
---
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")