[oe-commits] [openembedded-core] 48/65: libfm: remove file which conflicts with libfm-extra

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 679f76b5d385336ed9d0b651881e59465f6b02f0
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Thu Sep 7 13:30:35 2017 +0100

    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 at intel.com>
---
 meta/recipes-support/libfm/libfm_1.2.5.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-support/libfm/libfm_1.2.5.bb b/meta/recipes-support/libfm/libfm_1.2.5.bb
index aca59e1..1ddddfd 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.