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 <ross.burton@intel.com>

diff --git a/meta/recipes-support/libcap/libcap_2.25.bb b/meta/recipes-support/libcap/libcap_2.25.bb
index 0587e77e987e9d57be70e883a0e5c0e7cbc28b46..5c2765f343ac8e12d14093276a8ea315b10f5cb8 100644 (file)
--- 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}"