diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-12-17 20:47:17 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-05-05 14:44:57 +0100 |
| commit | 0013009deeeef4460d7205555b15583da1b4cec7 (patch) | |
| tree | 89ff9211e7e0b5585450f07d6884385f042e7980 /recipes/glibc/glibc-initial.inc | |
| parent | eb5a0f5a54334f3403a01c3cae61cd648229f870 (diff) | |
glibc-initial: Convert from legacy staging model (from Poky)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'recipes/glibc/glibc-initial.inc')
| -rw-r--r-- | recipes/glibc/glibc-initial.inc | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/recipes/glibc/glibc-initial.inc b/recipes/glibc/glibc-initial.inc index 6468f0df6d..effebf12f6 100644 --- a/recipes/glibc/glibc-initial.inc +++ b/recipes/glibc/glibc-initial.inc @@ -11,7 +11,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. @@ -29,28 +29,24 @@ do_compile () { : } -do_stage () { - oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} \ - includedir='${layout_includedir}' prefix='${layout_prefix}' \ +do_install () { + oe_runmake cross-compiling=yes install_root=${D} \ + includedir='${includedir}' prefix='${prefix}' \ install-bootstrap-headers=yes install-headers oe_runmake csu/subdir_lib # 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_INCDIR}/gnu - touch ${STAGING_INCDIR}/gnu/stubs.h - cp ${S}/include/features.h ${STAGING_INCDIR}/features.h + mkdir -p ${D}${includedir}/gnu/ + touch ${D}${includedir}/gnu/stubs.h + cp ${S}/include/features.h ${D}${includedir}/features.h if [ -e ${B}/bits/stdio_lim.h ]; then - cp ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/ + cp ${B}/bits/stdio_lim.h ${D}${includedir}/bits/ fi - mkdir -p ${STAGING_DIR_TARGET}${layout_libdir} - install -m 644 csu/crt[1in].o ${STAGING_DIR_TARGET}${layout_libdir} + mkdir -p ${D}${libdir}/ + install -m 644 csu/crt[1in].o ${D}${libdir} ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \ - -o ${STAGING_DIR_TARGET}${layout_libdir}/libc.so -} - -do_install () { - : + -o ${D}${libdir}/libc.so } |