diff options
| author | Ross Burton <ross.burton@intel.com> | 2017-09-07 13:30:35 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-11 17:30:30 +0100 |
| commit | 466b1c6d8d48194c7a50430ff795f553843a420d (patch) | |
| tree | 65f2d848f465945a15a5a667dd5da6b01aa0a303 | |
| parent | 3f5906e086d904f48e1790c59cf01c0c94b31b64 (diff) | |
| download | poky-466b1c6d8d48194c7a50430ff795f553843a420d.tar.gz | |
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.
(From OE-Core rev: 1ca7d8d89e35f55082d1708639e2146794730a0c)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-support/libfm/libfm_1.2.5.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-support/libfm/libfm_1.2.5.bb b/meta/recipes-support/libfm/libfm_1.2.5.bb index aca59e1476..1ddddfdc99 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 () { | |||
| 32 | rm -f ${D}${includedir}/libfm-1.0/fm-xml-file.h | 32 | rm -f ${D}${includedir}/libfm-1.0/fm-xml-file.h |
| 33 | rm -f ${D}${includedir}/libfm-1.0/fm-version.h | 33 | rm -f ${D}${includedir}/libfm-1.0/fm-version.h |
| 34 | rm -f ${D}${includedir}/libfm-1.0/fm-extra.h | 34 | rm -f ${D}${includedir}/libfm-1.0/fm-extra.h |
| 35 | rm -f ${D}${includedir}/libfm | ||
| 35 | rm -f ${D}${libdir}/pkgconfig/libfm-extra.pc | 36 | rm -f ${D}${libdir}/pkgconfig/libfm-extra.pc |
| 36 | rm -f ${D}${libdir}/libfm-extra.so* | 37 | rm -f ${D}${libdir}/libfm-extra.so* |
| 37 | rm -f ${D}${libdir}/libfm-extra.a | 38 | rm -f ${D}${libdir}/libfm-extra.a |