[Buildroot] [PATCH v2] Add support for eglibc-2.17 multiarch layout, from Linaro 2013.07+

[Greg Beresford]

From: Henry Luis <henry at echelon.com>

Arch-specific libraries, including libc.so.6, are expected to be in a
subdirectory of /lib (e.g. /lib/arm-linux-gnueabihf). This patch
changes copy_toolchain_lib_root() in helper.mk to preserve the
toolchain sysroot's lib directory structure, except for SUPPORT_LIB_DIR
which are still copied directly under DESTDIR.

Signed-off-by: Greg Beresford <greg.beresford at zbdsolutions.com>
---

I couldn't initially see a particularly clear way of removing the pushd
and popd commands, but the below worked (once I figured out how escape
it properly.)

Regards
Greg

 toolchain/helpers.mk | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 0e270ee..3b4900d 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -66,12 +66,17 @@ copy_toolchain_lib_root = \
 		LIBDIR=`dirname $${LIBPATH}` ; \
 		while test \! -z "$${LIBNAME}" ; do \
 			LIBPATH=$${LIBDIR}/$${LIBNAME} ; \
-			rm -fr $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \
-			mkdir -p $(TARGET_DIR)/$${DESTDIR}; \
+			if [ "$${dir}" = "$${SUPPORT_LIB_DIR}" ]; then \
+				DDIR=$${DESTDIR} ; \
+			else \
+				DDIR=$${LIBDIR\#$${ARCH_SYSROOT_DIR}} ; \
+			fi; \
+			rm -fr $(TARGET_DIR)/$${DDIR}/$${LIBNAME}; \
+			mkdir -p $(TARGET_DIR)/$${DDIR}; \
 			if test -h $${LIBPATH} ; then \
-				cp -d $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/; \
+				cp -d $${LIBPATH} $(TARGET_DIR)/$${DDIR}/; \
 			elif test -f $${LIBPATH}; then \
-				$(INSTALL) -D -m0755 $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \
+				$(INSTALL) -D -m0755 $${LIBPATH} $(TARGET_DIR)/$${DDIR}/$${LIBNAME}; \
 			else \
 				exit -1; \
 			fi; \
-- 
1.8.4


 
Disclaimer: This email contains proprietary information some or all of which may be legally privileged and/or is confidential. It is for the intended recipient only. If an addressing or transmission error has misdirected this email, please notify the author by replying to this email. If you are not the intended recipient, you must not use, disclose, distribute, copy or print this email. Any views expressed in this message are those of the individual sender, except where the message states otherwise. ZBD Displays accepts no responsibility for any computer virus which might be transferred by way of this email. We may monitor all email communication through our networks. If you contact us by email, we may store your name and address to facilitate communication. ZBD Displays Ltd is registered in England and Wales, company registration number: 03929602. Registered Office: Malvern Hills Science Park, Geraldine Road, Malvern,  Worcestershire, WR14 3SZ, UK

______________________________________________________________________
This email has been scanned by the Symantec Email Security.cloud service.
For more information please visit http://www.symanteccloud.com
______________________________________________________________________