reply: patch: fix wrong sysroot path when given rsdk toolchain

Message ID 14A4BC6FC7AB3340A49D24D6ACB7BED930621D@RS-MBS02.realsil.com.cn
State New
Headers show
Series
  • reply: patch: fix wrong sysroot path when given rsdk toolchain
Related show

Commit Message

陈小刚 July 19, 2018, 9:49 a.m.
Pasted the patch:

From 677dd7cab7872db393dad4bacbde1d2077305928 Mon Sep 17 00:00:00 2001
From: shawn_chen <shawn_chen@realsil.com.cn>
Date: Mon, 16 Jul 2018 16:51:34 +0800
Subject: [PATCH] fix: wrong sysroot path when given rsdk toolchain

IPCSDK-6460

Change-Id: Id75feedfb5358dbd8835fe9f2a6fefa688bd9ced
Signed-off-by: shawn_chen <shawn_chen@realsil.com.cn>
---
toolchain/toolchain-external/pkg-toolchain-external.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)



发件人: 陈小刚
发送时间: 2018年7月19日 17:10
收件人: 'buildroot@buildroot.org'
抄送: 'Thomas Petazzoni'; 'Thomas De Schampheleire'
主题: patch: fix wrong sysroot path when given rsdk toolchain

The attachment is a patch that fixes a Realtek toolchain that has a sysroot path of ‘mips-linux-uclibc’, this causes the buildroot recognizes the sysroot as ‘mips-linux-uc’ by the sed operation, and then the external toolchain setup is failed. Adding a ‘/’ in the sed re expression avoids the wrong substitution, other toolchains like linaro arm toolchain are tested ok to ensure no side effect is induced, please help review and apply this patch, thanks.

Regards
Shawn Chen
Realtek Semiconductor

Patch

diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk
index 3bf9fac..e12b656 100644
--- a/toolchain/toolchain-external/pkg-toolchain-external.mk
+++ b/toolchain/toolchain-external/pkg-toolchain-external.mk
@@ -335,7 +335,7 @@  endef
#
# And variations on these.
define toolchain_find_sysroot
-$$(printf $(call toolchain_find_libc_a,$(1)) | sed -r -e 's:(usr/)?lib(32|64)?([^/]*)?/([^/]*/)?libc\.a::')
+$$(printf $(call toolchain_find_libc_a,$(1)) | sed -r -e 's:/(usr/)?lib(32|64)?([^/]*)?/([^/]*/)?libc\.a::')
endef
 # Returns the lib subdirectory for the given compiler + flags (i.e
--
1.9.1