glibc: Factor staging function into a common .inc and remove hardcoded staging layout

diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb
index 0004eab..da33cca 100644 (file)
--- a/packages/glibc/eglibc_svn.bb
+++ b/packages/glibc/eglibc_svn.bb
@@ -15,7 +15,7 @@ RPROVIDES_${PN}-dev = "libc6-dev"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
-TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
+TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
 
 GLIBC_ADDONS ?= "ports,nptl,libidn"
 

diff --git a/packages/glibc/glibc-initial.inc b/packages/glibc/glibc-initial.inc
index 9355320..288cb08 100644 (file)
--- a/packages/glibc/glibc-initial.inc
+++ b/packages/glibc/glibc-initial.inc
@@ -30,14 +30,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='${layout_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/glibc-stage.inc b/packages/glibc/glibc-stage.inc
new file mode 100644 (file)
index 0000000..a86cf78
--- /dev/null
+++ b/packages/glibc/glibc-stage.inc
@@ -0,0 +1,23 @@
+do_stage() {
+       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_DIR_HOST}${layout_base_libdir}/libc.so.6' \
+                  install-headers install-lib
+
+       install -d ${STAGING_INCDIR}/gnu \
+                  ${STAGING_INCDIR}/bits \
+                  ${STAGING_INCDIR}/rpcsvc
+       install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
+       install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
+       install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
+       for r in ${rpcsvc}; do
+               h=`echo $r|sed -e's,\.x$,.h,'`
+               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_DIR_HOST}/${layout_base_libdir}/ || die "failed to install $i"
+       done
+       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
+}

diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb
index fd79701..7b5eca2 100644 (file)
--- a/packages/glibc/glibc_2.2.5.bb
+++ b/packages/glibc/glibc_2.2.5.bb
@@ -158,10 +158,10 @@ do_compile () {
 }
 
 do_stage() {
-       rm -f ${STAGING_LIBDIR}/libc.so.6
-       oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${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_DIR_HOST}${layout_base_libdir}libc.so.6' \
                   '${STAGING_INCDIR}/bits/errno.h' \
                   '${STAGING_INCDIR}/bits/libc-lock.h' \
                   '${STAGING_INCDIR}/gnu/stubs.h' \
@@ -187,9 +187,9 @@ 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 ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
+       echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libc.so
 }
 
 require glibc-package.bbclass

diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb
index df39c65..c44bf7d 100644 (file)
--- a/packages/glibc/glibc_2.3.2+cvs20040726.bb
+++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb
@@ -70,28 +70,6 @@ do_compile () {
        )
 }
 
-do_stage() {
-       rm -f ${STAGING_LIBDIR}/libc.so.6
-       oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${STAGING_LIBDIR}/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${STAGING_INCDIR}/gnu \
-                  ${STAGING_INCDIR}/bits \
-                  ${STAGING_INCDIR}/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
-       install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               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"
-       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
-}
+require glibc-stage.inc
 
 require glibc-package.bbclass

diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb
index 6022210..9290c9b 100644 (file)
--- a/packages/glibc/glibc_2.3.2.bb
+++ b/packages/glibc/glibc_2.3.2.bb
@@ -156,28 +156,6 @@ do_compile () {
        )
 }
 
-do_stage() {
-       rm -f ${STAGING_LIBDIR}/libc.so.6
-       oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${STAGING_LIBDIR}/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${STAGING_INCDIR}/gnu \
-                  ${STAGING_INCDIR}/bits \
-                  ${STAGING_INCDIR}/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
-       install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               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"
-       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
-}
+require glibc-stage.inc
 
 require glibc-package.bbclass

diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb
index 9fc4bcf..829ef8f 100644 (file)
--- a/packages/glibc/glibc_2.3.3+cvs20041128.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb
@@ -92,28 +92,6 @@ do_compile () {
        )
 }
 
-do_stage() {
-       rm -f ${STAGING_LIBDIR}/libc.so.6
-       oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${STAGING_LIBDIR}/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${STAGING_INCDIR}/gnu \
-                  ${STAGING_INCDIR}/bits \
-                  ${STAGING_INCDIR}/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
-       install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               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"
-       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
-}
+require glibc-stage.inc
 
 require glibc-package.bbclass

diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb
index 1bb9496..b940258 100644 (file)
--- a/packages/glibc/glibc_2.3.3+cvs20050221.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb
@@ -75,28 +75,6 @@ do_compile () {
        )
 }
 
-do_stage() {
-       rm -f ${STAGING_LIBDIR}/libc.so.6
-       oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${STAGING_LIBDIR}/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${STAGING_INCDIR}/gnu \
-                  ${STAGING_INCDIR}/bits \
-                  ${STAGING_INCDIR}/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
-       install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               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"
-       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
-}
+require glibc-stage.inc
 
 require glibc-package.bbclass

diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb
index 79ecd14..0a3759b 100644 (file)
--- a/packages/glibc/glibc_2.3.3+cvs20050420.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb
@@ -76,28 +76,6 @@ do_compile () {
        )
 }
 
-do_stage() {
-       rm -f ${STAGING_LIBDIR}/libc.so.6
-       oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${STAGING_LIBDIR}/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${STAGING_INCDIR}/gnu \
-                  ${STAGING_INCDIR}/bits \
-                  ${STAGING_INCDIR}/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
-       install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               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"
-       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
-}
+require glibc-stage.inc
 
 require glibc-package.bbclass

diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb
index 5e43a07..46fc230 100644 (file)
--- a/packages/glibc/glibc_2.3.3.bb
+++ b/packages/glibc/glibc_2.3.3.bb
@@ -101,28 +101,6 @@ do_compile () {
        )
 }
 
-do_stage() {
-       rm -f ${STAGING_LIBDIR}/libc.so.6
-       oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${STAGING_LIBDIR}/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${STAGING_INCDIR}/gnu \
-                  ${STAGING_INCDIR}/bits \
-                  ${STAGING_INCDIR}/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
-       install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               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"
-       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
-}
+require glibc-stage.inc
 
 require glibc-package.bbclass

diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb
index b06acd7..62cfd21 100644 (file)
--- a/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -129,28 +129,6 @@ do_compile () {
        )
 }
 
-do_stage() {
-       rm -f ${STAGING_LIBDIR}/libc.so.6
-       oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${STAGING_LIBDIR}/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${STAGING_INCDIR}/gnu \
-                  ${STAGING_INCDIR}/bits \
-                  ${STAGING_INCDIR}/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
-       install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               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"
-       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
-}
+require glibc-stage.inc
 
 require glibc-package.bbclass

diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb
index 9217779..67446ca 100644 (file)
--- a/packages/glibc/glibc_2.4.bb
+++ b/packages/glibc/glibc_2.4.bb
@@ -8,7 +8,7 @@ DEFAULT_PREFERENCE_arm = "-1"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
-TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
+TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
 
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
@@ -113,7 +113,6 @@ do_munge() {
 
 addtask munge before do_patch after do_unpack
 
-
 do_configure () {
 # override this function to avoid the autoconf/automake/aclocal/autoheader
 # calls for now
@@ -144,28 +143,6 @@ do_compile () {
        )
 }
 
-do_stage() {
-       rm -f ${STAGING_LIBDIR}/libc.so.6
-       oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${STAGING_LIBDIR}/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${STAGING_INCDIR}/gnu \
-                  ${STAGING_INCDIR}/bits \
-                  ${STAGING_INCDIR}/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
-       install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               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"
-       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
-}
+require glibc-stage.inc
 
 require glibc-package.bbclass

diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb
index 0218993..2ffa6f6 100644 (file)
--- a/packages/glibc/glibc_2.5.bb
+++ b/packages/glibc/glibc_2.5.bb
@@ -9,7 +9,7 @@ PR = "r7"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
-TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
+TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
 
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
@@ -154,28 +154,6 @@ do_compile () {
        )
 }
 
-do_stage() {
-       rm -f ${STAGING_LIBDIR}/libc.so.6
-       oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${STAGING_LIBDIR}/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${STAGING_INCDIR}/gnu \
-                  ${STAGING_INCDIR}/bits \
-                  ${STAGING_INCDIR}/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
-       install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               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"
-       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
-}
+require glibc-stage.inc
 
 require glibc-package.bbclass

diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb
index 26ea0e3..46b56a0 100644 (file)
--- a/packages/glibc/glibc_2.6.1.bb
+++ b/packages/glibc/glibc_2.6.1.bb
@@ -9,7 +9,7 @@ PR = "r1"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
-TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
+TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
 
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
@@ -151,28 +151,6 @@ do_compile () {
        )
 }
 
-do_stage() {
-       rm -f ${STAGING_LIBDIR}/libc.so.6
-       oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${STAGING_LIBDIR}/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${STAGING_INCDIR}/gnu \
-                  ${STAGING_INCDIR}/bits \
-                  ${STAGING_INCDIR}/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
-       install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               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"
-       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
-}
+require glibc-stage.inc
 
 require glibc-package.bbclass

diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb
index 5ce25ae..9dbea14 100644 (file)
--- a/packages/glibc/glibc_cvs.bb
+++ b/packages/glibc/glibc_cvs.bb
@@ -99,28 +99,6 @@ do_compile () {
        )
 }
 
-do_stage() {
-       rm -f ${STAGING_LIBDIR}/libc.so.6
-       oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-                  'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                  '${STAGING_LIBDIR}/libc.so.6' \
-                  install-headers install-lib
-
-       install -d ${STAGING_INCDIR}/gnu \
-                  ${STAGING_INCDIR}/bits \
-                  ${STAGING_INCDIR}/rpcsvc
-       install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
-       install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
-       install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
-       for r in ${rpcsvc}; do
-               h=`echo $r|sed -e's,\.x$,.h,'`
-               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"
-       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
-}
+require glibc-stage.inc
 
 require glibc-package.bbclass