glibc-external: add multilib link to -dev package

This link is required by linker to link libraries and crt* files in our
ADE/SDK. The 'rm -f' command is changed to 'rm -rf' because
external-toolchain.bbclass copies all the stuff required by PACKAGES to image
folder (in do_install stage). In doing so it copies the architecture folder
(as it is required by FILES_${PN}-dev ) from sourcery folder to image folder
in work directory. Afterwords when we try to remove the directory with 'rm -f'
it prompts an error as directories cannot be deleted with this command.

Signed-off-by: adnan-ali1 <adnan_ali@mentor.com>
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
This commit is contained in:
adnan-ali1
2015-06-05 21:38:13 +05:00
committed by Christopher Larson
parent b5c16532c4
commit 3f10799bf7
2 changed files with 3 additions and 1 deletions

View File

@@ -68,6 +68,7 @@ glibc_external_do_install_extra () {
"This may mean that your external toolchain uses a different" \
"multi-lib setup than your machine configuration"
fi
create_multilib_link ${D}
}
EXTERNAL_EXTRA_FILES += "\
@@ -143,6 +144,7 @@ FILES_${PN}-dev += "\
${libdir}/libthread_db${SOLIBSDEV} \
${libdir}/libpthread${SOLIBSDEV} \
"
FILES_${PN}-dev += "${@sysroot_multilib_suffix(d)}"
libc_headers_file = "${@bb.utils.which('${FILESPATH}', 'libc.headers')}"
FILES_${PN}-dev += "\
${@' '.join('${includedir}/' + f.rstrip() for f in base_read_file('${libc_headers_file}').splitlines())} \

View File

@@ -10,7 +10,7 @@ create_multilib_link () {
dest="$1"
multilib_suffix="${@sysroot_multilib_suffix(d)}"
if [ "$multilib_suffix" != "." ]; then
rm -f $dest/$multilib_suffix
rm -rf $dest/$multilib_suffix
ln -s . $dest/$multilib_suffix
fi
}