From: Ross Burton Date: Tue, 3 Jun 2014 10:11:18 +0000 (+0100) Subject: glibc: fix libdir/libexecdir path confusion X-Git-Tag: 2016-4~2028 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0c73dcb7c1c369a66e4c5804fcdd19f657426a5d;p=openembedded-core.git glibc: fix libdir/libexecdir path confusion $libdir/glibc is deleted if it doesn't exist but this is incorrectly assuming what variables are used to create this directory. In fact libexecdir is being used in the Makefile so use that in the recipe too. This fixes builds where libexecdir is changed. Signed-off-by: Ross Burton --- diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 5f6036840f..36c5350896 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -82,9 +82,10 @@ do_install_append () { rm -rf ${D}${localstatedir} # remove empty glibc dir - if [ -d ${D}${libdir}/glibc -a ! -e ${D}${libdir}/glibc/pt_chown ]; then - rmdir ${D}${libdir}/glibc + if [ -d ${D}${libexecdir} ]; then + rmdir --ignore-fail-on-non-empty ${D}${libexecdir} fi + oe_multilib_header bits/syscall.h if [ -f ${D}${bindir}/mtrace ]; then