From af85ce4b4e675feb5796f87137c86d70c2f15b9a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 16 Sep 2009 23:09:44 +0100 Subject: Remove layout_* variables 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 --- meta/packages/glibc/glibc-initial.inc | 10 +++++----- meta/packages/glibc/glibc_2.4.bb | 2 +- meta/packages/glibc/glibc_2.5.bb | 2 +- meta/packages/glibc/glibc_2.6.1.bb | 3 +-- meta/packages/glibc/glibc_2.9.bb | 2 +- meta/packages/glibc/glibc_csl-2005q3-2.bb | 2 +- 6 files changed, 10 insertions(+), 11 deletions(-) (limited to 'meta/packages/glibc') diff --git a/meta/packages/glibc/glibc-initial.inc b/meta/packages/glibc/glibc-initial.inc index 21b7631d3..127e93e9d 100644 --- a/meta/packages/glibc/glibc-initial.inc +++ b/meta/packages/glibc/glibc-initial.inc @@ -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 () { diff --git a/meta/packages/glibc/glibc_2.4.bb b/meta/packages/glibc/glibc_2.4.bb index 6a5e9f37d..3f184a6b1 100644 --- a/meta/packages/glibc/glibc_2.4.bb +++ b/meta/packages/glibc/glibc_2.4.bb @@ -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" diff --git a/meta/packages/glibc/glibc_2.5.bb b/meta/packages/glibc/glibc_2.5.bb index 0cab17f12..5f9528058 100644 --- a/meta/packages/glibc/glibc_2.5.bb +++ b/meta/packages/glibc/glibc_2.5.bb @@ -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" diff --git a/meta/packages/glibc/glibc_2.6.1.bb b/meta/packages/glibc/glibc_2.6.1.bb index f98864276..3d39e0f74 100644 --- a/meta/packages/glibc/glibc_2.6.1.bb +++ b/meta/packages/glibc/glibc_2.6.1.bb @@ -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" diff --git a/meta/packages/glibc/glibc_2.9.bb b/meta/packages/glibc/glibc_2.9.bb index 24b07163e..ea178366a 100644 --- a/meta/packages/glibc/glibc_2.9.bb +++ b/meta/packages/glibc/glibc_2.9.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}${layout_includedir}" +TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}" GLIBC_ADDONS ?= "ports,nptl,libidn" diff --git a/meta/packages/glibc/glibc_csl-2005q3-2.bb b/meta/packages/glibc/glibc_csl-2005q3-2.bb index c82121f02..d2aa11605 100644 --- a/meta/packages/glibc/glibc_csl-2005q3-2.bb +++ b/meta/packages/glibc/glibc_csl-2005q3-2.bb @@ -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" -- cgit v1.2.3