From ccc82214f654f7b9925ec172b4db2a13195b5837 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 8 Oct 2013 20:17:14 +0200 Subject: [PATCH] toolchain-external: improve target library copy logic The copy_toolchain_lib_root function is responsible for copying a given library (and its symbolic link) to the target filesystem. To do so, it looks for the library in various locations, and then iterates over the symbolic link all the way to the library, copying them as needed to the target filesystem. However, the latest Linaro toolchains bring an interesting use case: the lib/ directory in the toolchain is organized as follows: - ld-linux.so.3 -> arm-linux-gnueabi/ld-2.17...so - ld-linux-armhf.so.3 -> arm-linux-gnueabihf/ld-2.17...so - arm-linux-gnueabi/ - all ARMv4T soft float libraries - arm-linux-gnueabihf/ - all ARMv7 hard float libraries In order to match what we do with all other toolchains, we want all those libraries and symbolic links to be copied directly under $(TARGET_DIR)/lib. This commit does that by adjusting the copy logic. This is part of the fix for bug #6452 (eglibc from Linaro 2013.07 not copied to target correctly). Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- toolchain/helpers.mk | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index b6fe04c417..95120cd97b 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -60,21 +60,24 @@ copy_toolchain_lib_root = \ break ; \ fi \ done ; \ + mkdir -p $(TARGET_DIR)/$${DESTDIR}; \ for LIBPATH in $${LIBSPATH} ; do \ - LIBNAME=`basename $${LIBPATH}`; \ - LIBDIR=`dirname $${LIBPATH}` ; \ - while test \! -z "$${LIBNAME}" ; do \ - LIBPATH=$${LIBDIR}/$${LIBNAME} ; \ + while true ; do \ + LIBNAME=`basename $${LIBPATH}`; \ + LIBDIR=`dirname $${LIBPATH}` ; \ + LINKTARGET=`readlink $${LIBPATH}` ; \ rm -fr $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \ - mkdir -p $(TARGET_DIR)/$${DESTDIR}; \ if test -h $${LIBPATH} ; then \ - cp -d $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/; \ + ln -sf `basename $${LINKTARGET}` $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME} ; \ elif test -f $${LIBPATH}; then \ $(INSTALL) -D -m0755 $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \ else \ exit -1; \ fi; \ - LIBNAME="`readlink $${LIBPATH}`"; \ + if test -z "$${LINKTARGET}" ; then \ + break ; \ + fi ; \ + LIBPATH="`readlink -f $${LIBPATH}`"; \ done; \ done; \ \ -- 2.30.2