eglibc: Fix after the sysroot changes

diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb
index a03c63b..b78c4bd 100644 (file)
--- a/packages/glibc/eglibc_svn.bb
+++ b/packages/glibc/eglibc_svn.bb
@@ -89,10 +89,10 @@ do_stage() {
         # FIXME: this removes files from staging
         # make sure there isn't a conflicting libc in staging
         # this should be solved differently
-        rm -f ${STAGING_LIBDIR}/libc.so.6
+        rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6
         oe_runmake 'install_root=${STAGING_DIR_HOST}' \
                    'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \
-                   '${STAGING_LIBDIR}/libc.so.6' \
+                   '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \
                    install-headers install-lib
 
         install -d ${STAGING_INCDIR}/gnu \
@@ -106,10 +106,10 @@ do_stage() {
                 install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
         done
         for i in libc.a libc_pic.a libc_nonshared.a; do
-                install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i"
+                install -m 0644 ${B}/$i ${STAGING_DIR_HOST}${layout_base_libdir}/ || die "failed to install $i"
         done
-        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
-        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
+        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_DIR_HOST}${layout_base_libdir}/libpthread.so
+        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so
 }
 
 require eglibc-package.bbclass