summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libcap-ng/libcap-ng/python.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/libcap-ng/libcap-ng/python.patch')
-rw-r--r--meta/recipes-support/libcap-ng/libcap-ng/python.patch58
1 files changed, 0 insertions, 58 deletions
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 8db03ca31f..0000000000
--- a/meta/recipes-support/libcap-ng/libcap-ng/python.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1Subject: [PATCH] configure.ac - Avoid an incorrect check for python.
2 Makefile.am - avoid hard coded host include paths.
3
4Upstream-Status: pending
5
6Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
7Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
8Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
9Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
10
11---
12 bindings/python/Makefile.am | 4 +++-
13 configure.ac | 17 ++---------------
14 2 files changed, 5 insertions(+), 16 deletions(-)
15
16Index: libcap-ng-0.8.2/bindings/python/Makefile.am
17===================================================================
18--- libcap-ng-0.8.2.orig/bindings/python/Makefile.am
19+++ libcap-ng-0.8.2/bindings/python/Makefile.am
20@@ -23,7 +23,9 @@
21 SUBDIRS = test
22 CONFIG_CLEAN_FILES = *.loT *.rej *.orig
23 AM_CFLAGS = -fPIC -DPIC
24-AM_CPPFLAGS = -I. -I$(top_builddir) -I@PYINCLUDEDIR@
25+PYLIBVER ?= python$(PYTHON_VERSION)
26+PYINC ?= /usr/include/$(PYLIBVER)
27+AM_CPPFLAGS = -I. -I$(top_builddir) -I$(PYINC)
28 SWIG_FLAGS = -python
29 SWIG_INCLUDES = ${AM_CPPFLAGS}
30 pyexec_PYTHON = capng.py
31Index: libcap-ng-0.8.2/configure.ac
32===================================================================
33--- libcap-ng-0.8.2.orig/configure.ac
34+++ libcap-ng-0.8.2/configure.ac
35@@ -169,21 +169,8 @@ fi
36
37 # Setup Python2 with the interpreter found previously.
38 AM_PATH_PYTHON
39-PYINCLUDEDIR=`python${am_cv_python_version} -c "from distutils import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))"`
40-if test -f ${PYINCLUDEDIR}/Python.h ; then
41- python_found="yes"
42- AC_SUBST(PYINCLUDEDIR)
43- pybind_dir="python"
44- AC_SUBST(pybind_dir)
45- AC_MSG_NOTICE(Python bindings will be built)
46-else
47- python_found="no"
48- if test "x$use_python" = xyes ; then
49- AC_MSG_ERROR([Python explicitly requested and python headers were not found])
50- else
51- AC_MSG_WARN("Python headers not found - python bindings will not be made")
52- fi
53-fi
54+python_found="yes"
55+AC_MSG_NOTICE(Python bindings will be built)
56 fi
57 AM_CONDITIONAL(HAVE_PYTHON, test ${python_found} = "yes")
58