diff options
author | Marek Vasut <marex@denx.de> | 2016-09-04 18:20:20 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-08 00:32:43 +0100 |
commit | b4f2c760aa4e9a92d5ce829136b60ab0ebed186c (patch) | |
tree | c24bdcad135fa7769eb8c8d8f82a396ae30f6dee /meta/recipes-support | |
parent | f52cc8bdefc4d063ae077d3c1ecfdd3de4ee29f9 (diff) | |
download | poky-b4f2c760aa4e9a92d5ce829136b60ab0ebed186c.tar.gz |
libcap: Replace EXTRA_OECONF with PACKAGECONFIG_CONFARGS
When building libcap and DISTRO_FEATURES does not contain pam,
the build will fail on missing pam headers. This is because the
bits from EXTRA_OECONF moved to PACKAGECONFIG_CONFARGS and thus
the necessary options are not propagated to oe_runmake anymore.
Replace EXTRA_OECONF with PACKAGECONFIG_CONFARGS to fix this.
| arm-poky-linux-gnueabi-gcc -march=armv7-a -mfpu=vfp -mfloat-abi=softfp --sysroot=/b/tmp/sysroots/board -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=/b/tmp/work/armv7a-vfp-poky-linux-gnueabi/libcap/2.25-r0=/usr/src/debug/libcap/2.25-r0 -fdebug-prefix-map=/b/tmp/sysroots/x86_64-linux= -fdebug-prefix-map=/b/tmp/sysroots/board= -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Dlinux -Wall -Wwrite-strings -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wshadow -g -Dlinux -Wall -Wwrite-strings -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wshadow -g -fPIC -I/b/tmp/work/armv7a-vfp-poky-linux-gnueabi/libcap/2.25-r0/libcap-2.25/pam_cap/../libcap/include/uapi -I/b/tmp/work/armv7a-vfp-poky-linux-gnueabi/libcap/2.25-r0/libcap-2.25/pam_cap/../libcap/include -c pam_cap.c -o pam_cap.o
| pam_cap.c:19:34: fatal error: security/pam_modules.h: No such file or directory
| #include <security/pam_modules.h>
| ^
| compilation terminated.
(From OE-Core rev: f3a50f89a217014c0926498e99e62c617a8a4cae)
Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/libcap/libcap_2.25.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-support/libcap/libcap_2.25.bb b/meta/recipes-support/libcap/libcap_2.25.bb index 8f3f11e5e6..7ced4be626 100644 --- a/meta/recipes-support/libcap/libcap_2.25.bb +++ b/meta/recipes-support/libcap/libcap_2.25.bb | |||
@@ -47,12 +47,12 @@ EXTRA_OEMAKE_append_class-target = " SYSTEM_HEADERS=${STAGING_INCDIR}" | |||
47 | CFLAGS += "-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" | 47 | CFLAGS += "-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" |
48 | 48 | ||
49 | do_compile() { | 49 | do_compile() { |
50 | oe_runmake ${EXTRA_OECONF} | 50 | oe_runmake ${PACKAGECONFIG_CONFARGS} |
51 | } | 51 | } |
52 | 52 | ||
53 | do_install() { | 53 | do_install() { |
54 | oe_runmake install \ | 54 | oe_runmake install \ |
55 | ${EXTRA_OECONF} \ | 55 | ${PACKAGECONFIG_CONFARGS} \ |
56 | DESTDIR="${D}" \ | 56 | DESTDIR="${D}" \ |
57 | prefix="${prefix}" \ | 57 | prefix="${prefix}" \ |
58 | SBINDIR="${sbindir}" | 58 | SBINDIR="${sbindir}" |