libcap2_2.16.bb: dont check build system pam headers during build

diff --git a/recipes/libcap/libcap2-2.16/0002-pam-includes-fix.patch b/recipes/libcap/libcap2-2.16/0002-pam-includes-fix.patch
new file mode 100644 (file)
index 0000000..ae76458
--- /dev/null
+++ b/recipes/libcap/libcap2-2.16/0002-pam-includes-fix.patch
@@ -0,0 +1,12 @@
+diff -Naur libcap-2.16-org/Make.Rules libcap-2.16/Make.Rules
+--- libcap-2.16-org/Make.Rules 2009-07-31 09:36:20.000000000 +0200
++++ libcap-2.16/Make.Rules     2009-07-31 09:31:29.000000000 +0200
+@@ -63,7 +63,7 @@
+ LDFLAGS += -L$(topdir)/libcap
+ CPPFLAGS += -Dlinux
+ CFLAGS += $(WARNINGS)
+-PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
++PAM_CAP := $(shell if [ -f $(inc_dir)/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
+ INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
+ DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
+ LIBATTR := yes

diff --git a/recipes/libcap/libcap2_2.16.bb b/recipes/libcap/libcap2_2.16.bb
index 09d7094..7a82076 100644 (file)
--- a/recipes/libcap/libcap2_2.16.bb
+++ b/recipes/libcap/libcap2_2.16.bb
@@ -10,6 +10,7 @@ LDFLAGS_prepend = "-L../libcap"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/security/linux-privs/libcap2/libcap-${PV}.tar.bz2 \
           file://0001-build-system-fixes.patch;patch=1 \
+          file://0002-pam-includes-fix.patch;patch=1 \
        "
 
 S = "${WORKDIR}/libcap-${PV}"
@@ -17,6 +18,8 @@ S = "${WORKDIR}/libcap-${PV}"
 FILES_${PN} = "${libdir}"
 FILES_${PN}-dev = "${includedir}"
 
+export inc_dir=${STAGING_INCDIR}
+
 do_install() {
        install -d ${D}${includedir}/sys
        install -m 0644 libcap/include/sys/capability.h ${D}${includedir}/sys/