diff mbox series

libfm: remove file which conflicts with libfm-extra

Message ID 20170907133509.30701-1-ross.burton@intel.com
State Accepted
Commit 1ca7d8d89e35f55082d1708639e2146794730a0c
Headers show
Series libfm: remove file which conflicts with libfm-extra | expand

Commit Message

Ross Burton Sept. 7, 2017, 1:35 p.m. UTC
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>

---
 meta/recipes-support/libfm/libfm_1.2.5.bb | 1 +
 1 file changed, 1 insertion(+)

-- 
2.11.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff mbox series

Patch

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