summaryrefslogtreecommitdiffstats
path: root/meta/packages/glibc/glibc_2.5.bb
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-10-29 20:35:03 +0000
committerRichard Purdie <richard@openedhand.com>2007-10-29 20:35:03 +0000
commit6a97ee543a3e1ec9398b8a009f4a6324cdfab2a2 (patch)
treefb1eda00c9c6a3974211e96a8b4bb158ec7f4fae /meta/packages/glibc/glibc_2.5.bb
parent3b945ff45c9caf683962ad34dcde602cba0a1186 (diff)
downloadpoky-6a97ee543a3e1ec9398b8a009f4a6324cdfab2a2.tar.gz
glibc: Convert from hardcoded staging layout
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3027 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/glibc/glibc_2.5.bb')
-rw-r--r--meta/packages/glibc/glibc_2.5.bb18
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/packages/glibc/glibc_2.5.bb b/meta/packages/glibc/glibc_2.5.bb
index 6432aefb8c..f41321372a 100644
--- a/meta/packages/glibc/glibc_2.5.bb
+++ b/meta/packages/glibc/glibc_2.5.bb
@@ -3,8 +3,8 @@ require glibc.inc
3PR = "r5" 3PR = "r5"
4 4
5# the -isystem in bitbake.conf screws up glibc do_stage 5# the -isystem in bitbake.conf screws up glibc do_stage
6BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" 6BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
7TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include" 7TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
8 8
9 9
10FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" 10FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
@@ -152,10 +152,10 @@ do_compile () {
152} 152}
153 153
154do_stage() { 154do_stage() {
155 rm -f ${STAGING_LIBDIR}/libc.so.6 155 rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6
156 oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \ 156 oe_runmake 'install_root=${STAGING_DIR_HOST}' \
157 'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \ 157 'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \
158 '${STAGING_LIBDIR}/libc.so.6' \ 158 '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \
159 install-headers install-lib 159 install-headers install-lib
160 160
161 install -d ${STAGING_INCDIR}/gnu \ 161 install -d ${STAGING_INCDIR}/gnu \
@@ -169,10 +169,10 @@ do_stage() {
169 install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/ 169 install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
170 done 170 done
171 for i in libc.a libc_pic.a libc_nonshared.a; do 171 for i in libc.a libc_pic.a libc_nonshared.a; do
172 install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i" 172 install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_base_libdir} || die "failed to install $i"
173 done 173 done
174 echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so 174 echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libpthread.so
175 echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so 175 echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libc.so
176} 176}
177 177
178require glibc-package.bbclass 178require glibc-package.bbclass