diff options
| -rw-r--r-- | meta-oe/recipes-support/libcap-ng/libcap-ng/python.patch | 39 | ||||
| -rw-r--r-- | meta-oe/recipes-support/libcap-ng/libcap-ng_0.7.4.bb | 37 |
2 files changed, 76 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/libcap-ng/libcap-ng/python.patch b/meta-oe/recipes-support/libcap-ng/libcap-ng/python.patch new file mode 100644 index 0000000000..d82ceb454b --- /dev/null +++ b/meta-oe/recipes-support/libcap-ng/libcap-ng/python.patch | |||
| @@ -0,0 +1,39 @@ | |||
| 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 | ||
diff --git a/meta-oe/recipes-support/libcap-ng/libcap-ng_0.7.4.bb b/meta-oe/recipes-support/libcap-ng/libcap-ng_0.7.4.bb new file mode 100644 index 0000000000..8823dad390 --- /dev/null +++ b/meta-oe/recipes-support/libcap-ng/libcap-ng_0.7.4.bb | |||
| @@ -0,0 +1,37 @@ | |||
| 1 | SUMMARY = "An alternate posix capabilities library" | ||
| 2 | DESCRIPTION = "The libcap-ng library is intended to make programming \ | ||
| 3 | with POSIX capabilities much easier than the traditional libcap library." | ||
| 4 | HOMEPAGE = "http://freecode.com/projects/libcap-ng" | ||
| 5 | SECTION = "base" | ||
| 6 | LICENSE = "GPLv2+ & LGPLv2.1+" | ||
| 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
| 8 | file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" | ||
| 9 | |||
| 10 | SRC_URI = "http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \ | ||
| 11 | file://python.patch" | ||
| 12 | |||
| 13 | inherit lib_package autotools pythonnative | ||
| 14 | |||
| 15 | SRC_URI[md5sum] = "55c57c0673b944ea1a755bcb2636dabd" | ||
| 16 | SRC_URI[sha256sum] = "48a2083276f9820cb92dcb05d001b30733bcbf48c14c230303cac3cd08b45b6b" | ||
| 17 | |||
| 18 | DEPENDS += "swig-native python" | ||
| 19 | |||
| 20 | EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' PYINC='${STAGING_INCDIR}/${PYLIBVER}'" | ||
| 21 | |||
| 22 | PACKAGES += "${PN}-python" | ||
| 23 | |||
| 24 | FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug" | ||
| 25 | FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" | ||
| 26 | |||
| 27 | BBCLASSEXTEND = "native" | ||
| 28 | |||
| 29 | do_install_append() { | ||
| 30 | # Moving libcap-ng to base_libdir | ||
| 31 | if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then | ||
| 32 | mkdir -p ${D}/${base_libdir}/ | ||
| 33 | mv -f ${D}${libdir}/libcap-ng.so.* ${D}${base_libdir}/ | ||
| 34 | relpath=${@os.path.relpath("${base_libdir}", "${libdir}")} | ||
| 35 | ln -sf ${relpath}/libcap-ng.so.0.0.0 ${D}${libdir}/libcap-ng.so | ||
| 36 | fi | ||
| 37 | } | ||
