eglibc: Remove hardcoded layout, improve staging path references

diff --git a/packages/glibc/eglibc-initial_svn.bb b/packages/glibc/eglibc-initial_svn.bb
index 5b78d57..298c775 100644 (file)
--- a/packages/glibc/eglibc-initial_svn.bb
+++ b/packages/glibc/eglibc-initial_svn.bb
@@ -33,14 +33,14 @@ do_compile () {
 }
 
 do_stage () {
-       oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers
+       oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} includedir=${layout_includedir} prefix="" install-headers
 
        # Two headers -- stubs.h and features.h -- aren't installed by install-headers,
        # so do them by hand.  We can tolerate an empty stubs.h for the moment.
        # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
-       mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu
-       touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h
-       cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h
+       mkdir -p ${STAGING_INCDIR}/gnu
+       touch ${STAGING_INCDIR}/gnu/stubs.h
+       cp ${S}/include/features.h ${STAGING_INCDIR}/features.h
 }
 
 do_install () {

diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb
index ff68185..a03c63b 100644 (file)
--- a/packages/glibc/eglibc_svn.bb
+++ b/packages/glibc/eglibc_svn.bb
@@ -90,8 +90,8 @@ do_stage() {
         # make sure there isn't a conflicting libc in staging
         # this should be solved differently
         rm -f ${STAGING_LIBDIR}/libc.so.6
-        oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-                   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
+        oe_runmake 'install_root=${STAGING_DIR_HOST}' \
+                   'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \
                    '${STAGING_LIBDIR}/libc.so.6' \
                    install-headers install-lib