mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-15 06:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove layout_* variables

Browse Source 
Remove layout_* variables and replace them with variables specific to the
different classes. The layout variables were only useful for the native/cross
classes and caused more confusion than they solved. They didn't scale to the
sdk class. It now clear a small set of native/cross variables fulfil the needs.

This patch also changes native.bbclass to use "/" as the STAGING_DIR which makes
sense since we're installing binaries into the locations we're compiling them for.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
2009-09-16 23:09:44 +01:00
parent 046ae6a38d
commit af85ce4b4e
57 changed files with 210 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
meta/packages/glibc/glibc-initial.inc
View File

@@ -12,7 +12,7 @@ do_configure () {
find ${S} -name "configure" | xargs touch
${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
--without-cvs --disable-sanity-checks \
--with-headers=${STAGING_DIR_TARGET}${layout_includedir} \
--with-headers=${STAGING_DIR_TARGET}${includedir} \
--enable-hacker-mode
if grep -q GLIBC_2.3 ${S}/ChangeLog; then
# glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
@@ -32,7 +32,7 @@ do_compile () {
do_stage () {
oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} \
includedir='${layout_includedir}' prefix='${layout_prefix}' \
includedir='${includedir}' prefix='${prefix}' \
install-bootstrap-headers=yes install-headers
oe_runmake csu/subdir_lib
@@ -46,10 +46,10 @@ do_stage () {
if [ -e ${B}/bits/stdio_lim.h ]; then
cp ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
fi
mkdir -p ${STAGING_DIR_TARGET}${layout_libdir}
install -m 644 csu/crt[1in].o ${STAGING_DIR_TARGET}${layout_libdir}
mkdir -p ${STAGING_DIR_TARGET}${libdir}
install -m 644 csu/crt[1in].o ${STAGING_DIR_TARGET}${libdir}
${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
-o ${STAGING_DIR_TARGET}${layout_libdir}/libc.so
-o ${STAGING_DIR_TARGET}${libdir}/libc.so
}
do_install () {

2
meta/packages/glibc/glibc_2.4.bb
View File

@@ -4,7 +4,7 @@ PR = "r13"
# the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"

2
meta/packages/glibc/glibc_2.5.bb
View File

@@ -4,7 +4,7 @@ PR = "r8"
# the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"

3
meta/packages/glibc/glibc_2.6.1.bb
View File

@@ -1,4 +1,3 @@
require glibc.inc
PR = "r6"
ARM_INSTRUCTION_SET = "arm"
@@ -8,7 +7,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}${layout_includedir}"
TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"

2
meta/packages/glibc/glibc_2.9.bb
View File

@@ -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}${layout_includedir}"
TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
GLIBC_ADDONS ?= "ports,nptl,libidn"

2
meta/packages/glibc/glibc_csl-2005q3-2.bb
View File

@@ -6,7 +6,7 @@ PR = "r11"
# the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
GLIBC_ADDONS ?= "nptl,libidn"