diff options
| author | Ross Burton <ross.burton@intel.com> | 2017-04-25 17:07:08 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-11 16:59:19 +0100 |
| commit | 10fdf0e53507e5b14346638e2606ee1a0e868350 (patch) | |
| tree | ed71605839a5d83a2d58fa34e055ffbc01859dc1 /meta/recipes-support/libcap | |
| parent | c64160e347d295c0f31b49f1b63ef291f11bc842 (diff) | |
| download | poky-10fdf0e53507e5b14346638e2606ee1a0e868350.tar.gz | |
libcap: clean up gperf enabling logic
There's no need to sed the Makefile (especially the wrong Makefile) when there's
a variable we can pass.
(From OE-Core rev: 43f7652baa0f1973477731ce05786eda2cc81c09)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libcap')
| -rw-r--r-- | meta/recipes-support/libcap/libcap_2.25.bb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/recipes-support/libcap/libcap_2.25.bb b/meta/recipes-support/libcap/libcap_2.25.bb index 0587e77e98..5c2765f343 100644 --- a/meta/recipes-support/libcap/libcap_2.25.bb +++ b/meta/recipes-support/libcap/libcap_2.25.bb | |||
| @@ -22,9 +22,6 @@ do_configure() { | |||
| 22 | # on what should be replaced with ?= | 22 | # on what should be replaced with ?= |
| 23 | sed -e 's,:=,?=,g' -i Make.Rules | 23 | sed -e 's,:=,?=,g' -i Make.Rules |
| 24 | sed -e 's,^BUILD_CFLAGS ?= $(.*CFLAGS),BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules | 24 | sed -e 's,^BUILD_CFLAGS ?= $(.*CFLAGS),BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules |
| 25 | |||
| 26 | # disable gperf detection | ||
| 27 | sed -e '/shell gperf/cifeq (,yes)' -i libcap/Makefile | ||
| 28 | } | 25 | } |
| 29 | 26 | ||
| 30 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" | 27 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" |
| @@ -37,6 +34,7 @@ EXTRA_OEMAKE = " \ | |||
| 37 | lib=${@os.path.basename('${libdir}')} \ | 34 | lib=${@os.path.basename('${libdir}')} \ |
| 38 | RAISE_SETFCAP=no \ | 35 | RAISE_SETFCAP=no \ |
| 39 | DYNAMIC=yes \ | 36 | DYNAMIC=yes \ |
| 37 | BUILD_GPERF=yes \ | ||
| 40 | " | 38 | " |
| 41 | 39 | ||
| 42 | EXTRA_OEMAKE_append_class-target = " SYSTEM_HEADERS=${STAGING_INCDIR}" | 40 | EXTRA_OEMAKE_append_class-target = " SYSTEM_HEADERS=${STAGING_INCDIR}" |
