diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2020-06-02 11:06:05 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-18 12:25:00 +0100 |
commit | 756f6d0fe98596c949d1f70a7999ce1a5844ba55 (patch) | |
tree | ec1038f7346d29b4baf437dfbd65fb812be561ef /meta/recipes-graphics/cairo/cairo_1.16.0.bb | |
parent | f3ae12c9403049251935a4004bf973033645d466 (diff) | |
download | poky-756f6d0fe98596c949d1f70a7999ce1a5844ba55.tar.gz |
cairo: Do not try to remove nonexistent directories
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: 5e33d1d1d655c50a817acda85f2df67c67196daf)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 9bb2268677ac8f0c97433bf1f04555abe88028a9)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/cairo/cairo_1.16.0.bb')
-rw-r--r-- | meta/recipes-graphics/cairo/cairo_1.16.0.bb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-graphics/cairo/cairo_1.16.0.bb b/meta/recipes-graphics/cairo/cairo_1.16.0.bb index b772c2ece2..8663dec404 100644 --- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb +++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb | |||
@@ -68,8 +68,10 @@ do_install_append () { | |||
68 | rm -rf ${D}${libdir}/cairo/cairo-sphinx* | 68 | rm -rf ${D}${libdir}/cairo/cairo-sphinx* |
69 | rm -rf ${D}${libdir}/cairo/.debug/cairo-fdr* | 69 | rm -rf ${D}${libdir}/cairo/.debug/cairo-fdr* |
70 | rm -rf ${D}${libdir}/cairo/.debug/cairo-sphinx* | 70 | rm -rf ${D}${libdir}/cairo/.debug/cairo-sphinx* |
71 | rmdir -p --ignore-fail-on-non-empty ${D}${bindir} | 71 | [ ! -d ${D}${bindir} ] || |
72 | rmdir -p --ignore-fail-on-non-empty ${D}${libdir}/cairo | 72 | rmdir -p --ignore-fail-on-non-empty ${D}${bindir} |
73 | [ ! -d ${D}${libdir}/cairo ] || | ||
74 | rmdir -p --ignore-fail-on-non-empty ${D}${libdir}/cairo | ||
73 | } | 75 | } |
74 | 76 | ||
75 | PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils" | 77 | PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils" |