[oe-commits] org.oe.dev eglibc: Fix after the sysroot changes

[rpurdie commit]

eglibc: Fix after the sysroot changes

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: abd10c0eb0d2e1d8bbb7ada660da9c089c696f79
ViewMTN: http://monotone.openembedded.org/revision/info/abd10c0eb0d2e1d8bbb7ada660da9c089c696f79
Files:
1
packages/glibc/eglibc_svn.bb
Diffs:

#
# mt diff -r6b1f5fad1dae5c0aeedf5cd50aedf43731a60332 -rabd10c0eb0d2e1d8bbb7ada660da9c089c696f79
#
#
#
# patch "packages/glibc/eglibc_svn.bb"
#  from [2cf6a0fbb0bf1ac56fc2f096f68a8e53c4510678]
#    to [0640a4ca3a3ad4eb546fdbf41d6c747b28dcd5d4]
#
============================================================
--- packages/glibc/eglibc_svn.bb	2cf6a0fbb0bf1ac56fc2f096f68a8e53c4510678
+++ packages/glibc/eglibc_svn.bb	0640a4ca3a3ad4eb546fdbf41d6c747b28dcd5d4
@@ -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