[1/3] arm-toolchain/arm-binary-toolchain: ensure toolchains don't provide any system libraries

Message ID 20220504141254.785384-1-ross.burton@arm.com
State New
Headers show
Series [1/3] arm-toolchain/arm-binary-toolchain: ensure toolchains don't provide any system libraries | expand

Commit Message

Ross Burton May 4, 2022, 2:12 p.m. UTC
Use PRIVATE_LIBS to ensure that the Arm binary toolchains don't provide
their own libraries to the entire system.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../external-arm-toolchain/arm-binary-toolchain.inc            | 3 +++
 1 file changed, 3 insertions(+)

Comments

Jon Mason May 6, 2022, 8:43 p.m. UTC | #1
On Wed, 4 May 2022 15:12:52 +0100, Ross Burton wrote:
> Use PRIVATE_LIBS to ensure that the Arm binary toolchains don't provide
> their own libraries to the entire system.

Applied, thanks!

[1/3] arm-toolchain/arm-binary-toolchain: ensure toolchains don't provide any system libraries
      commit: c65eed7160341a97cd6908cb86def01f122ec4db
[2/3] arm/optee: remove redundant ${S} in LIC_FILES_CHKSUM
      commit: 80facbb124c9ea289a59a3b7214495cd62c758ad
[3/3] arm-bsp/corstone1000-*-image: mark these as corstone1000-specific
      commit: 28d6f6667b229922417e5494f49689d2940a7be4

Best regards,

Patch

diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/arm-binary-toolchain.inc b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/arm-binary-toolchain.inc
index 1fa4cd3e..528b0061 100644
--- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/arm-binary-toolchain.inc
+++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/arm-binary-toolchain.inc
@@ -20,4 +20,7 @@  INHIBIT_SYSROOT_STRIP = "1"
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
+# Need to mark these as private until do_package's soname-finder only looks in $libdir
+PRIVATE_LIBS = "libgcc_s.so.1 libstdc++.so.6"
+
 BBCLASSEXTEND = "native nativesdk"