mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

glibc: Convert from hardcoded staging layout

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3027 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2007-10-29 20:35:03 +00:00
parent 3b945ff45c
commit 6a97ee543a
5 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/packages/glibc/glibc-initial.inc
+4 -4
View File
@@ -30,14 +30,14 @@ do_compile () {
} }
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='${layout_prefix}' install-headers
# Two headers -- stubs.h and features.h -- aren't installed by 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. # 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 # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu mkdir -p ${STAGING_INCDIR}/gnu
touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h touch ${STAGING_INCDIR}/gnu/stubs.h
cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h cp ${S}/include/features.h ${STAGING_INCDIR}/features.h
} }
do_install () { do_install () {
meta/packages/glibc/glibc_2.3.5+cvs20050627.bb
+7 -7
View File
@@ -120,10 +120,10 @@ do_compile () {
} }
do_stage() { do_stage() {
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_SYS}' \ oe_runmake 'install_root=${STAGING_DIR_HOST}' \
'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \ '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-headers install-lib
install -d ${STAGING_INCDIR}/gnu \ install -d ${STAGING_INCDIR}/gnu \
@@ -137,10 +137,10 @@ do_stage() {
install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/ install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
done done
for i in libc.a libc_pic.a libc_nonshared.a; do 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 done
echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.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_LIBDIR}/libc.so echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libc.so
} }
require glibc-package.bbclass require glibc-package.bbclass
meta/packages/glibc/glibc_2.4.bb
+9 -9
View File
@@ -7,8 +7,8 @@ PRIORITY = "required"
PR = "r11" PR = "r11"
# the -isystem in bitbake.conf screws up glibc do_stage # the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" 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" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
@@ -149,10 +149,10 @@ do_compile () {
} }
do_stage() { do_stage() {
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_SYS}' \ oe_runmake 'install_root=${STAGING_DIR_HOST}' \
'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \ '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-headers install-lib
install -d ${STAGING_INCDIR}/gnu \ install -d ${STAGING_INCDIR}/gnu \
@@ -166,10 +166,10 @@ do_stage() {
install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/ install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
done done
for i in libc.a libc_pic.a libc_nonshared.a; do 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 done
echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.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_LIBDIR}/libc.so echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libc.so
} }
require glibc-package.bbclass require glibc-package.bbclass
meta/packages/glibc/glibc_2.5.bb
+9 -9
View File
@@ -3,8 +3,8 @@ require glibc.inc
PR = "r5" PR = "r5"
# the -isystem in bitbake.conf screws up glibc do_stage # the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" 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" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
@@ -152,10 +152,10 @@ do_compile () {
} }
do_stage() { do_stage() {
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_SYS}' \ oe_runmake 'install_root=${STAGING_DIR_HOST}' \
'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \ '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-headers install-lib
install -d ${STAGING_INCDIR}/gnu \ install -d ${STAGING_INCDIR}/gnu \
@@ -169,10 +169,10 @@ do_stage() {
install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/ install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
done done
for i in libc.a libc_pic.a libc_nonshared.a; do 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 done
echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.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_LIBDIR}/libc.so echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libc.so
} }
require glibc-package.bbclass require glibc-package.bbclass
meta/packages/glibc/glibc_csl-2005q3-2.bb
+9 -9
View File
@@ -8,8 +8,8 @@ PV = "2.3.6+csl-arm-2005q3-2"
PR = "r11" PR = "r11"
# the -isystem in bitbake.conf screws up glibc do_stage # the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include" TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
FILESDIR = "${FILE_DIRNAME}/files" FILESDIR = "${FILE_DIRNAME}/files"
@@ -100,10 +100,10 @@ do_compile () {
} }
do_stage() { do_stage() {
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_SYS}' \ oe_runmake 'install_root=${STAGING_DIR_HOST}' \
'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \ '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-headers install-lib
install -d ${STAGING_INCDIR}/gnu \ install -d ${STAGING_INCDIR}/gnu \
@@ -117,10 +117,10 @@ do_stage() {
install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/ install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
done done
for i in libc.a libc_pic.a libc_nonshared.a; do 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 done
echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.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_LIBDIR}/libc.so echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libc.so
} }
require glibc-package.bbclass require glibc-package.bbclass