summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Kubizňák <kubiznak@2n.com>2023-01-04 12:45:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-01-26 23:37:05 +0000
commitdc62b99bdfcef6626ff1d61ce54aaddbd3b80c38 (patch)
treee3f1b8b3c90a1827c2217819fc55e82520abb3f9
parent9fecba6b89c02878e197aeb2c10fb838f6cb09c5 (diff)
downloadpoky-dc62b99bdfcef6626ff1d61ce54aaddbd3b80c38.tar.gz
harfbuzz: remove bindir only if it exists
In some scenarios (e.g. when "glib" removed from PACKAGECONFIG), "${D}${bindir}" might not exist which caused `rmdir` to fail. (From OE-Core rev: b342790a37c891cf83f24d4f96060e2d0bd79c07) Signed-off-by: Petr Kubizňák <kubiznak@2n.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 21261072cbe0056e85550a0710de142fab8943e4) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz_4.0.1.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_4.0.1.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_4.0.1.bb
index b639c276db..bdbb322e42 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_4.0.1.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_4.0.1.bb
@@ -35,9 +35,9 @@ PACKAGES =+ "${PN}-icu ${PN}-icu-dev ${PN}-subset"
35LEAD_SONAME = "libharfbuzz.so" 35LEAD_SONAME = "libharfbuzz.so"
36 36
37do_install:append() { 37do_install:append() {
38 # If no tools are installed due to PACKAGECONFIG then this directory is 38 # If no tools are installed due to PACKAGECONFIG then this directory might
39 #still installed, so remove it to stop packaging wanings. 39 # still be installed, so remove it to stop packaging warnings.
40 rmdir --ignore-fail-on-non-empty ${D}${bindir} 40 [ ! -d ${D}${bindir} ] || rmdir --ignore-fail-on-non-empty ${D}${bindir}
41} 41}
42 42
43FILES:${PN}-icu = "${libdir}/libharfbuzz-icu.so.*" 43FILES:${PN}-icu = "${libdir}/libharfbuzz-icu.so.*"