[OE-core] [PATCH 2/3] glibc: fix libdir/libexecdir path confusion
Ross Burton
ross.burton at intel.com
Thu Dec 3 19:57:44 UTC 2015
$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 <ross.burton at intel.com>
---
meta/recipes-core/glibc/glibc-package.inc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 5f60368..36c5350 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
--
2.1.4
More information about the Openembedded-core
mailing list