summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-06-03 11:11:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-08 10:20:08 +0000
commit0c73dcb7c1c369a66e4c5804fcdd19f657426a5d (patch)
treeba8b65088cb1879efa053f2cb699f25c07e09573 /meta
parent431ad7a268fc07c367ce830c4f69dba515f44b4e (diff)
downloadopenembedded-core-contrib-0c73dcb7c1c369a66e4c5804fcdd19f657426a5d.tar.gz
openembedded-core-contrib-0c73dcb7c1c369a66e4c5804fcdd19f657426a5d.tar.bz2
openembedded-core-contrib-0c73dcb7c1c369a66e4c5804fcdd19f657426a5d.zip
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 <ross.burton@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc5
1 files changed, 3 insertions, 2 deletions
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