diff options
author | Randy MacLeod <Randy.MacLeod@windriver.com> | 2019-06-16 11:48:15 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-18 11:23:48 +0100 |
commit | fa239aa7c1cf44f9a157cd47f4a355b596b00388 (patch) | |
tree | 2f5f11a3bbe0b5361aa2746e9ea36437ef3d9d5b /meta/recipes-support/libcap-ng/libcap-ng | |
parent | f1a582bd0be0fb887729731126d83c469446cf95 (diff) | |
download | poky-fa239aa7c1cf44f9a157cd47f4a355b596b00388.tar.gz |
libcap-ng: split into libcap-ng/libcap-ng-python
util-linux's setpriv needs the libcap-ng library but
not the python package so split the package up to enable
this without a dependency loop.
(From OE-Core rev: 9592b318ccd6a8dca60d1060c8255ed8e62ef046)
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libcap-ng/libcap-ng')
l--------- | meta/recipes-support/libcap-ng/libcap-ng | 1 | ||||
-rw-r--r-- | meta/recipes-support/libcap-ng/libcap-ng/python.patch | 62 |
2 files changed, 1 insertions, 62 deletions
diff --git a/meta/recipes-support/libcap-ng/libcap-ng b/meta/recipes-support/libcap-ng/libcap-ng new file mode 120000 index 0000000000..fb7744d293 --- /dev/null +++ b/meta/recipes-support/libcap-ng/libcap-ng | |||
@@ -0,0 +1 @@ | |||
libcap-ng-python \ No newline at end of file | |||
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 d60a0a39b6..0000000000 --- a/meta/recipes-support/libcap-ng/libcap-ng/python.patch +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | From b4a354ae8d4f7c2ec3ec421c7d8a790cc57e77a9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Li xin <lixin.fnst@cn.fujitsu.com> | ||
3 | Date: Sat, 18 Jul 2015 23:03:30 +0900 | ||
4 | Subject: [PATCH] configure.ac - Avoid an incorrect check for python. | ||
5 | Makefile.am - avoid hard coded host include paths. | ||
6 | |||
7 | Upstream-Status: pending | ||
8 | |||
9 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
10 | Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> | ||
11 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
12 | --- | ||
13 | bindings/python/Makefile.am | 4 +++- | ||
14 | configure.ac | 17 ++--------------- | ||
15 | 2 files changed, 5 insertions(+), 16 deletions(-) | ||
16 | |||
17 | diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am | ||
18 | index 999b184..c8e49db 100644 | ||
19 | --- a/bindings/python/Makefile.am | ||
20 | +++ b/bindings/python/Makefile.am | ||
21 | @@ -23,7 +23,9 @@ | ||
22 | SUBDIRS = test | ||
23 | CONFIG_CLEAN_FILES = *.loT *.rej *.orig | ||
24 | AM_CFLAGS = -fPIC -DPIC | ||
25 | -AM_CPPFLAGS = -I. -I$(top_builddir) -I@PYINCLUDEDIR@ | ||
26 | +PYLIBVER ?= python$(PYTHON_VERSION) | ||
27 | +PYINC ?= /usr/include/$(PYLIBVER) | ||
28 | +AM_CPPFLAGS = -I. -I$(top_builddir) -I$(PYINC) | ||
29 | SWIG_FLAGS = -python | ||
30 | SWIG_INCLUDES = ${AM_CPPFLAGS} | ||
31 | pyexec_PYTHON = capng.py | ||
32 | diff --git a/configure.ac b/configure.ac | ||
33 | index 7f66179..079d026 100644 | ||
34 | --- a/configure.ac | ||
35 | +++ b/configure.ac | ||
36 | @@ -123,21 +123,8 @@ if test x$use_python = xno ; then | ||
37 | else | ||
38 | AC_MSG_RESULT(testing) | ||
39 | AM_PATH_PYTHON | ||
40 | -PYINCLUDEDIR=`python${am_cv_python_version} -c "from distutils import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))"` | ||
41 | -if test -f ${PYINCLUDEDIR}/Python.h ; then | ||
42 | - python_found="yes" | ||
43 | - AC_SUBST(PYINCLUDEDIR) | ||
44 | - pybind_dir="python" | ||
45 | - AC_SUBST(pybind_dir) | ||
46 | - AC_MSG_NOTICE(Python bindings will be built) | ||
47 | -else | ||
48 | - python_found="no" | ||
49 | - if test x$use_python = xyes ; then | ||
50 | - AC_MSG_ERROR([Python explicitly requested and python headers were not found]) | ||
51 | - else | ||
52 | - AC_MSG_WARN("Python headers not found - python bindings will not be made") | ||
53 | - fi | ||
54 | -fi | ||
55 | +python_found="yes" | ||
56 | +AC_MSG_NOTICE(Python bindings will be built) | ||
57 | fi | ||
58 | AM_CONDITIONAL(HAVE_PYTHON, test ${python_found} = "yes") | ||
59 | |||
60 | -- | ||
61 | 2.7.4 | ||
62 | |||