From 43f7652baa0f1973477731ce05786eda2cc81c09 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 25 Apr 2017 17:07:08 +0100 Subject: 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. Signed-off-by: Ross Burton --- meta/recipes-support/libcap/libcap_2.25.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'meta/recipes-support/libcap') 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() { # on what should be replaced with ?= sed -e 's,:=,?=,g' -i Make.Rules sed -e 's,^BUILD_CFLAGS ?= $(.*CFLAGS),BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules - - # disable gperf detection - sed -e '/shell gperf/cifeq (,yes)' -i libcap/Makefile } PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" @@ -37,6 +34,7 @@ EXTRA_OEMAKE = " \ lib=${@os.path.basename('${libdir}')} \ RAISE_SETFCAP=no \ DYNAMIC=yes \ + BUILD_GPERF=yes \ " EXTRA_OEMAKE_append_class-target = " SYSTEM_HEADERS=${STAGING_INCDIR}" -- cgit 1.2.3-korg