diff options
Diffstat (limited to 'recipes/eglibc/eglibc-initial.inc')
-rw-r--r-- | recipes/eglibc/eglibc-initial.inc | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/recipes/eglibc/eglibc-initial.inc b/recipes/eglibc/eglibc-initial.inc index 7a5a7b22f4..eb765df178 100644 --- a/recipes/eglibc/eglibc-initial.inc +++ b/recipes/eglibc/eglibc-initial.inc @@ -13,7 +13,7 @@ do_configure () { ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \ --prefix=/usr \ --without-cvs --disable-sanity-checks \ - --with-headers=${STAGING_DIR_TARGET}${layout_includedir} \ + --with-headers=${STAGING_DIR_TARGET}${includedir} \ --enable-hacker-mode --enable-addons } @@ -21,18 +21,24 @@ do_compile () { : } -do_stage () { - oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} \ - includedir='${layout_includedir}' prefix='${layout_prefix}' install-headers \ - install-bootstrap-headers=yes - oe_runmake csu/subdir_lib +do_install () { + oe_runmake cross-compiling=yes install_root=${D} \ + includedir='${includedir}' prefix='${prefix}' \ + install-bootstrap-headers=yes install-headers - mkdir -p ${STAGING_DIR_TARGET}${layout_libdir} - install -m 644 csu/crt[1in].o ${STAGING_DIR_TARGET}${layout_libdir} - ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \ - -o ${STAGING_DIR_TARGET}${layout_libdir}/libc.so -} + 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 ${D}${includedir}/gnu/ + touch ${D}${includedir}/gnu/stubs.h + cp ${S}/include/features.h ${D}${includedir}/features.h -do_install () { - : + if [ -e ${B}/bits/stdio_lim.h ]; then + cp ${B}/bits/stdio_lim.h ${D}${includedir}/bits/ + fi + mkdir -p ${D}${libdir}/ + install -m 644 csu/crt[1in].o ${D}${libdir} + ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \ + -o ${D}${libdir}/libc.so } |