[oe-commits] org.oe.dev eglibc: Remove hardcoded layout, improve staging path references

[rpurdie commit]

eglibc: Remove hardcoded layout, improve staging path references

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

#
# mt diff -rabefd5c15ebfe091ec64838729bdcd9a756919b8 -raea71c0a8bdc279045e3e86f31a70196962e910e
#
# 
# 
# patch "packages/glibc/eglibc-initial_svn.bb"
#  from [46bafc76fbe8160a3e1317fac15ef3e15e3565bb]
#    to [0547991d73a5b6ba8b352b27825176d869221e0e]
# 
# patch "packages/glibc/eglibc_svn.bb"
#  from [e0e53388d3e2f7fb82da6c0800429fb089aaa667]
#    to [2cf6a0fbb0bf1ac56fc2f096f68a8e53c4510678]
# 
============================================================
--- packages/glibc/eglibc-initial_svn.bb	46bafc76fbe8160a3e1317fac15ef3e15e3565bb
+++ packages/glibc/eglibc-initial_svn.bb	0547991d73a5b6ba8b352b27825176d869221e0e
@@ -33,14 +33,14 @@ do_stage () {
 }
 
 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 () {
============================================================
--- packages/glibc/eglibc_svn.bb	e0e53388d3e2f7fb82da6c0800429fb089aaa667
+++ packages/glibc/eglibc_svn.bb	2cf6a0fbb0bf1ac56fc2f096f68a8e53c4510678
@@ -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