]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
harfbuzz: remove bindir only if it exists
authorPetr Kubizňák <kubiznak@2n.com>
Wed, 4 Jan 2023 11:45:55 +0000 (12:45 +0100)
committerSteve Sakoman <steve@sakoman.com>
Fri, 20 Jan 2023 02:28:32 +0000 (16:28 -1000)
In some scenarios (e.g. when "glib" removed from PACKAGECONFIG),
"${D}${bindir}" might not exist which caused `rmdir` to fail.

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>
meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb

index 4905e8e2adb512d4e9be13d91b7f746f38e9f6e3..8e06acc011b70d33d4dc739d255b77fec6f2959c 100644 (file)
@@ -32,9 +32,9 @@ PACKAGES =+ "${PN}-icu ${PN}-icu-dev ${PN}-subset"
 LEAD_SONAME = "libharfbuzz.so"
 
 do_install:append() {
-    # If no tools are installed due to PACKAGECONFIG then this directory is
-    #still installed, so remove it to stop packaging wanings.
-    rmdir --ignore-fail-on-non-empty ${D}${bindir}
+    # If no tools are installed due to PACKAGECONFIG then this directory might
+    # still be installed, so remove it to stop packaging warnings.
+    [ ! -d ${D}${bindir} ] || rmdir --ignore-fail-on-non-empty ${D}${bindir}
 }
 
 FILES:${PN}-icu = "${libdir}/libharfbuzz-icu.so.*"