[oe-commits] Richard Purdie : libcap: Allow rebuilds to work correctly

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 2a7b96549aab7c6dd854edf3c18e2bb6bb48479d
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2a7b96549aab7c6dd854edf3c18e2bb6bb48479d

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Fri Dec 20 12:05:25 2013 +0000

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 at linuxfoundation.org>

---

 meta/recipes-support/libcap/libcap.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index 1b11b85..5319bc3 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 = " \