diff options
author | zangrc <zangrc.fnst@cn.fujitsu.com> | 2020-08-27 21:16:23 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-27 21:41:57 +0100 |
commit | b2ad2a7a7d445aa3e37eed5e640ce2a865299104 (patch) | |
tree | 413a4f1d02e0785f486714dcf725ee7c4b23196d /meta/recipes-support/libcap-ng/libcap-ng/python.patch | |
parent | 426d5aa8d9856d4a75f018e67a46630fd8285a7b (diff) | |
download | poky-b2ad2a7a7d445aa3e37eed5e640ce2a865299104.tar.gz |
libcap-ng:upgrade 0.7.10 -> 0.7.11
0001-configure.ac-add-library-if-header-found.patch
0002-Wrap-pthread_atfork-usage-in-HAVE_PTHREAD_H.patch
Removed since these are included in 0.7.11
Refresh the following patch:
python.patch
(From OE-Core rev: e883035f13ee86a63eaffe5ac55bf2ce20c5ba10)
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libcap-ng/libcap-ng/python.patch')
-rw-r--r-- | meta/recipes-support/libcap-ng/libcap-ng/python.patch | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/meta/recipes-support/libcap-ng/libcap-ng/python.patch b/meta/recipes-support/libcap-ng/libcap-ng/python.patch index d60a0a39b6..fcd6f9cd33 100644 --- a/meta/recipes-support/libcap-ng/libcap-ng/python.patch +++ b/meta/recipes-support/libcap-ng/libcap-ng/python.patch | |||
@@ -1,6 +1,3 @@ | |||
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. | 1 | Subject: [PATCH] configure.ac - Avoid an incorrect check for python. |
5 | Makefile.am - avoid hard coded host include paths. | 2 | Makefile.am - avoid hard coded host include paths. |
6 | 3 | ||
@@ -9,6 +6,8 @@ Upstream-Status: pending | |||
9 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 6 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
10 | Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> | 7 | Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> |
11 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 8 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
9 | Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> | ||
10 | |||
12 | --- | 11 | --- |
13 | bindings/python/Makefile.am | 4 +++- | 12 | bindings/python/Makefile.am | 4 +++- |
14 | configure.ac | 17 ++--------------- | 13 | configure.ac | 17 ++--------------- |
@@ -30,12 +29,12 @@ index 999b184..c8e49db 100644 | |||
30 | SWIG_INCLUDES = ${AM_CPPFLAGS} | 29 | SWIG_INCLUDES = ${AM_CPPFLAGS} |
31 | pyexec_PYTHON = capng.py | 30 | pyexec_PYTHON = capng.py |
32 | diff --git a/configure.ac b/configure.ac | 31 | diff --git a/configure.ac b/configure.ac |
33 | index 7f66179..079d026 100644 | 32 | index 8b46f51..2d7e00c 100644 |
34 | --- a/configure.ac | 33 | --- a/configure.ac |
35 | +++ b/configure.ac | 34 | +++ b/configure.ac |
36 | @@ -123,21 +123,8 @@ if test x$use_python = xno ; then | 35 | @@ -141,21 +141,8 @@ fi |
37 | else | 36 | |
38 | AC_MSG_RESULT(testing) | 37 | # Setup Python2 with the interpreter found previously. |
39 | AM_PATH_PYTHON | 38 | AM_PATH_PYTHON |
40 | -PYINCLUDEDIR=`python${am_cv_python_version} -c "from distutils import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))"` | 39 | -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 | 40 | -if test -f ${PYINCLUDEDIR}/Python.h ; then |
@@ -46,7 +45,7 @@ index 7f66179..079d026 100644 | |||
46 | - AC_MSG_NOTICE(Python bindings will be built) | 45 | - AC_MSG_NOTICE(Python bindings will be built) |
47 | -else | 46 | -else |
48 | - python_found="no" | 47 | - python_found="no" |
49 | - if test x$use_python = xyes ; then | 48 | - if test "x$use_python" = xyes ; then |
50 | - AC_MSG_ERROR([Python explicitly requested and python headers were not found]) | 49 | - AC_MSG_ERROR([Python explicitly requested and python headers were not found]) |
51 | - else | 50 | - else |
52 | - AC_MSG_WARN("Python headers not found - python bindings will not be made") | 51 | - AC_MSG_WARN("Python headers not found - python bindings will not be made") |
@@ -58,5 +57,4 @@ index 7f66179..079d026 100644 | |||
58 | AM_CONDITIONAL(HAVE_PYTHON, test ${python_found} = "yes") | 57 | AM_CONDITIONAL(HAVE_PYTHON, test ${python_found} = "yes") |
59 | 58 | ||
60 | -- | 59 | -- |
61 | 2.7.4 | 60 | 2.25.1 |
62 | |||