Integrate parts of meta-intel-iot-security
[AGL/meta-agl.git] / meta-security / recipes-security / libcap-ng / libcap-ng / python.patch
1 configure.ac - Avoid an incorrect check for python.
2 Makefile.am - avoid hard coded host include paths.
3
4 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
5
6 --- libcap-ng-0.6.5/configure.ac.orig   2012-01-17 13:59:03.645898989 -0600
7 +++ libcap-ng-0.6.5/configure.ac        2012-01-17 13:59:46.353959252 -0600
8 @@ -120,17 +120,8 @@
9  else
10  AC_MSG_RESULT(testing)
11  AM_PATH_PYTHON
12 -if test -f /usr/include/python${am_cv_python_version}/Python.h ; then
13 -       python_found="yes"
14 -       AC_MSG_NOTICE(Python bindings will be built)
15 -else
16 -       python_found="no"
17 -       if test x$use_python = xyes ; then
18 -               AC_MSG_ERROR([Python explicitly required and python headers found])
19 -       else
20 -               AC_MSG_WARN("Python headers not found - python bindings will not be made")
21 -       fi
22 -fi
23 +python_found="yes"
24 +AC_MSG_NOTICE(Python bindings will be built)
25  fi
26  AM_CONDITIONAL(HAVE_PYTHON, test ${python_found} = "yes")
27  
28 --- libcap-ng-0.6.5/bindings/python/Makefile.am.orig    2010-11-03 12:31:59.000000000 -0500
29 +++ libcap-ng-0.6.5/bindings/python/Makefile.am 2012-01-17 14:05:50.199834467 -0600
30 @@ -24,7 +24,8 @@
31  CONFIG_CLEAN_FILES = *.loT *.rej *.orig
32  AM_CFLAGS = -fPIC -DPIC
33  PYLIBVER ?= python$(PYTHON_VERSION)
34 -INCLUDES = -I. -I$(top_builddir) -I/usr/include/$(PYLIBVER)
35 +PYINC ?= /usr/include/$(PYLIBVER)
36 +INCLUDES = -I. -I$(top_builddir) -I$(PYINC)
37  LIBS = $(top_builddir)/src/libcap-ng.la
38  pyexec_PYTHON = capng.py
39  pyexec_LTLIBRARIES = _capng.la