summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/libcap-ng/libcap-ng/python.patch28
-rw-r--r--meta/recipes-support/libcap-ng/libcap-ng_0.7.9.bb (renamed from meta/recipes-support/libcap-ng/libcap-ng_0.7.8.bb)4
2 files changed, 18 insertions, 14 deletions
diff --git a/meta/recipes-support/libcap-ng/libcap-ng/python.patch b/meta/recipes-support/libcap-ng/libcap-ng/python.patch
index 59591eb469..d60a0a39b6 100644
--- a/meta/recipes-support/libcap-ng/libcap-ng/python.patch
+++ b/meta/recipes-support/libcap-ng/libcap-ng/python.patch
@@ -1,4 +1,4 @@
1From b01bb2694f66cd981e6d61523433dc3eb5ed32f2 Mon Sep 17 00:00:00 2001 1From b4a354ae8d4f7c2ec3ec421c7d8a790cc57e77a9 Mon Sep 17 00:00:00 2001
2From: Li xin <lixin.fnst@cn.fujitsu.com> 2From: Li xin <lixin.fnst@cn.fujitsu.com>
3Date: Sat, 18 Jul 2015 23:03:30 +0900 3Date: Sat, 18 Jul 2015 23:03:30 +0900
4Subject: [PATCH] configure.ac - Avoid an incorrect check for python. 4Subject: [PATCH] configure.ac - Avoid an incorrect check for python.
@@ -8,30 +8,32 @@ Upstream-Status: pending
8 8
9Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 9Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
10Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> 10Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
11Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
11--- 12---
12 bindings/python/Makefile.am | 3 ++- 13 bindings/python/Makefile.am | 4 +++-
13 configure.ac | 15 ++------------- 14 configure.ac | 17 ++---------------
14 2 files changed, 4 insertions(+), 14 deletions(-) 15 2 files changed, 5 insertions(+), 16 deletions(-)
15 16
16diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am 17diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
17index 82b9bb8..f9fe7a8 100644 18index 999b184..c8e49db 100644
18--- a/bindings/python/Makefile.am 19--- a/bindings/python/Makefile.am
19+++ b/bindings/python/Makefile.am 20+++ b/bindings/python/Makefile.am
20@@ -23,7 +23,8 @@ SUBDIRS = test 21@@ -23,7 +23,9 @@
22 SUBDIRS = test
21 CONFIG_CLEAN_FILES = *.loT *.rej *.orig 23 CONFIG_CLEAN_FILES = *.loT *.rej *.orig
22 AM_CFLAGS = -fPIC -DPIC 24 AM_CFLAGS = -fPIC -DPIC
23 PYLIBVER ?= python$(PYTHON_VERSION)
24-AM_CPPFLAGS = -I. -I$(top_builddir) -I@PYINCLUDEDIR@ 25-AM_CPPFLAGS = -I. -I$(top_builddir) -I@PYINCLUDEDIR@
26+PYLIBVER ?= python$(PYTHON_VERSION)
25+PYINC ?= /usr/include/$(PYLIBVER) 27+PYINC ?= /usr/include/$(PYLIBVER)
26+AM_CPPFLAGS = -I. -I$(top_builddir) -I$(PYINC) 28+AM_CPPFLAGS = -I. -I$(top_builddir) -I$(PYINC)
27 LIBS = $(top_builddir)/src/libcap-ng.la
28 SWIG_FLAGS = -python 29 SWIG_FLAGS = -python
29 SWIG_INCLUDES = ${AM_CPPFLAGS} 30 SWIG_INCLUDES = ${AM_CPPFLAGS}
31 pyexec_PYTHON = capng.py
30diff --git a/configure.ac b/configure.ac 32diff --git a/configure.ac b/configure.ac
31index 1d777d5..9d90f64 100644 33index 7f66179..079d026 100644
32--- a/configure.ac 34--- a/configure.ac
33+++ b/configure.ac 35+++ b/configure.ac
34@@ -123,19 +123,8 @@ if test x$use_python = xno ; then 36@@ -123,21 +123,8 @@ if test x$use_python = xno ; then
35 else 37 else
36 AC_MSG_RESULT(testing) 38 AC_MSG_RESULT(testing)
37 AM_PATH_PYTHON 39 AM_PATH_PYTHON
@@ -39,11 +41,13 @@ index 1d777d5..9d90f64 100644
39-if test -f ${PYINCLUDEDIR}/Python.h ; then 41-if test -f ${PYINCLUDEDIR}/Python.h ; then
40- python_found="yes" 42- python_found="yes"
41- AC_SUBST(PYINCLUDEDIR) 43- AC_SUBST(PYINCLUDEDIR)
44- pybind_dir="python"
45- AC_SUBST(pybind_dir)
42- AC_MSG_NOTICE(Python bindings will be built) 46- AC_MSG_NOTICE(Python bindings will be built)
43-else 47-else
44- python_found="no" 48- python_found="no"
45- if test x$use_python = xyes ; then 49- if test x$use_python = xyes ; then
46- AC_MSG_ERROR([Python explicitly required and python headers found]) 50- AC_MSG_ERROR([Python explicitly requested and python headers were not found])
47- else 51- else
48- AC_MSG_WARN("Python headers not found - python bindings will not be made") 52- AC_MSG_WARN("Python headers not found - python bindings will not be made")
49- fi 53- fi
@@ -54,5 +58,5 @@ index 1d777d5..9d90f64 100644
54 AM_CONDITIONAL(HAVE_PYTHON, test ${python_found} = "yes") 58 AM_CONDITIONAL(HAVE_PYTHON, test ${python_found} = "yes")
55 59
56-- 60--
571.8.4.2 612.7.4
58 62
diff --git a/meta/recipes-support/libcap-ng/libcap-ng_0.7.8.bb b/meta/recipes-support/libcap-ng/libcap-ng_0.7.9.bb
index 358319419d..aff6259db2 100644
--- a/meta/recipes-support/libcap-ng/libcap-ng_0.7.8.bb
+++ b/meta/recipes-support/libcap-ng/libcap-ng_0.7.9.bb
@@ -12,8 +12,8 @@ SRC_URI = "http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \
12 12
13inherit lib_package autotools python3native 13inherit lib_package autotools python3native
14 14
15SRC_URI[md5sum] = "0dece96644bd798020e170fbf7663802" 15SRC_URI[md5sum] = "2398d695508fab9ce33668c53a89b0e9"
16SRC_URI[sha256sum] = "c21af997445cd4107a55d386f955c5ea6f6e96ead693e9151277c0ab5f97d05f" 16SRC_URI[sha256sum] = "4a1532bcf3731aade40936f6d6a586ed5a66ca4c7455e1338d1f6c3e09221328"
17 17
18DEPENDS += "swig-native python3" 18DEPENDS += "swig-native python3"
19 19