From: Ross Burton <ross.burton@intel.com>
Date: Thu, 7 Sep 2017 12:30:35 +0000 (+0100)
Subject: libfm: remove file which conflicts with libfm-extra
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~20074
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ca7d8d89e35f55082d1708639e2146794730a0c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

libfm: remove file which conflicts with libfm-extra

Both libfm and libfm-extra provide /usr/include/libfm, so remove it from libfm
to avoid sysroot conflicts.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/recipes-support/libfm/libfm_1.2.5.bb b/meta/recipes-support/libfm/libfm_1.2.5.bb
index aca59e1476a..1ddddfdc990 100644
--- a/meta/recipes-support/libfm/libfm_1.2.5.bb
+++ b/meta/recipes-support/libfm/libfm_1.2.5.bb
@@ -32,6 +32,7 @@ do_install_append () {
     rm -f ${D}${includedir}/libfm-1.0/fm-xml-file.h
     rm -f ${D}${includedir}/libfm-1.0/fm-version.h
     rm -f ${D}${includedir}/libfm-1.0/fm-extra.h
+    rm -f ${D}${includedir}/libfm
     rm -f ${D}${libdir}/pkgconfig/libfm-extra.pc
     rm -f ${D}${libdir}/libfm-extra.so*
     rm -f ${D}${libdir}/libfm-extra.a