mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-26 11:29:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

cairo: Do not try to remove nonexistent directories

Browse Source 
Commit 0e1f8fa0 (bitbake.conf: propagate 'opengl' DISTRO_FEATURE to
native/nativesdk from target) changed the default PACKAGECONFIG for
native and nativesdk so that it becomes empty unless "x11" is in
DISTRO_FEATURES since "trace" was also removed (propbably
unintentionally). This highlighted than an empty PACKAGECONFIG would
lead to a build failure since /usr/bin is never created under these
conditions, but the recipe still tried to remove it.

(From OE-Core rev: 9bb2268677ac8f0c97433bf1f04555abe88028a9)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Kjellerstedt
2020-06-02 11:06:05 +02:00
committed by Richard Purdie
parent 251aa56136
commit e075a77c14
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meta/recipes-graphics/cairo/cairo_1.16.0.bb
View File

@@ -70,8 +70,10 @@ do_install_append () {
rm -rf ${D}${libdir}/cairo/cairo-sphinx*
rm -rf ${D}${libdir}/cairo/.debug/cairo-fdr*
rm -rf ${D}${libdir}/cairo/.debug/cairo-sphinx*
rmdir -p --ignore-fail-on-non-empty ${D}${bindir}
rmdir -p --ignore-fail-on-non-empty ${D}${libdir}/cairo
[ ! -d ${D}${bindir} ] ||
rmdir -p --ignore-fail-on-non-empty ${D}${bindir}
[ ! -d ${D}${libdir}/cairo ] ||
rmdir -p --ignore-fail-on-non-empty ${D}${libdir}/cairo
}
PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils"