From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 20 Dec 2013 12:05:25 +0000 (+0000)
Subject: libcap: Allow rebuilds to work correctly
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~35054
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a7b96549aab7c6dd854edf3c18e2bb6bb48479d;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

libcap: Allow rebuilds to work correctly

Currently rerunning configure for libcap causes a build failure. This fixes
the sed expressions to work correctly for a rebuild.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index 1b11b85554b..5319bc35641 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap.inc
@@ -23,7 +23,7 @@ do_configure() {
 	# libcap uses := for compilers, fortunately, it gives us a hint
 	# 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
+	sed -e 's,^BUILD_CFLAGS ?= $(.*CFLAGS),BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules
 }
 
 EXTRA_OEMAKE = " \