Denys Dmytriyenko af69667215 arm-toolchain/gcc,external-arm-toolchain: resolve conflict with gcc headers ...

Historically external-arm-toolchain recipe packaged all gcc headers from
${libdir}/gcc/${TARGET_SYS}/${BINV}/include - some would be picked up by
packages like gcc-sanitizers, libssp-dev. libquadmath-dev or libgomp-dev.
The rest would fall into catch-all libgcc-dev package.

Unfortunately, that could result in a conflict with a target gcc, which
also packages some of those files, like unwind.h or stddef.h, among others.

The conflict could be seen with this config:

EXTRA_IMAGE_FEATURES += "dev-pkgs tools-sdk"
TCMODE = "external-arm"
EXTERNAL_TOOLCHAIN = "/OE/toolchains/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu"

And the error message is:

Error: Transaction test error:
  file /usr/lib/gcc/aarch64-poky-linux/11.2.1/include/stddef.h conflicts between attempted installs of libgcc-s-dev-11.2.1-r0.1.cortexa57 and gcc-arm+11.2-r2022.02.1.cortexa57
  file /usr/lib/gcc/aarch64-poky-linux/11.2.1/include/unwind.h conflicts between attempted installs of libgcc-s-dev-11.2.1-r0.1.cortexa57 and gcc-arm+11.2-r2022.02.1.cortexa57

Modify external-arm-toolchain recipe according to how libgcc in OE-Core
handles those header files by removing and not packaging them:

https://git.openembedded.org/openembedded-core/tree/meta/recipes-devtools/gcc/libgcc-common.inc#n40

Also need to adjust gcc recipe to pick up unwind.h from EXTERNAL_TOOLCHAIN
location now, since libgcc-dev no longer carries it, and install it into
STAGING_LIBDIR_NATIVE, where OE-Core gcc-target.inc expects it from
gcc-cross:

https://git.openembedded.org/openembedded-core/tree/meta/recipes-devtools/gcc/gcc-target.inc#n164

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>

2022-09-10 20:59:29 -04:00

..

gcc-arm-11.2

arm-toolchain: update Arm GCC to 11.2

2022-03-23 09:34:09 -04:00

gcc_arm-11.2.bb

arm-toolchain: update Arm GCC to 11.2

2022-03-23 09:34:09 -04:00

gcc-arm-11.2.inc

arm-toolchain: update Arm GCC to 11.2

2022-03-23 09:34:09 -04:00

gcc-arm-common.inc

arm-toolchain/gcc,external-arm-toolchain: resolve conflict with gcc headers

2022-09-10 20:59:29 -04:00

gcc-cross_arm-11.2.bb

arm-toolchain: update Arm GCC to 11.2

2022-03-23 09:34:09 -04:00

gcc-cross-canadian_arm-11.2.bb

arm-toolchain: update Arm GCC to 11.2

2022-03-23 09:34:09 -04:00

gcc-crosssdk_arm-11.2.bb

arm-toolchain: update Arm GCC to 11.2

2022-03-23 09:34:09 -04:00

gcc-runtime_arm-11.2.bb

arm-toolchain: update Arm GCC to 11.2

2022-03-23 09:34:09 -04:00

gcc-sanitizers_arm-11.2.bb

arm-toolchain: update Arm GCC to 11.2

2022-03-23 09:34:09 -04:00

gcc-source_arm-11.2.bb

arm-toolchain: update Arm GCC to 11.2

2022-03-23 09:34:09 -04:00

libgcc_arm-11.2.bb

arm-toolchain: update Arm GCC to 11.2

2022-03-23 09:34:09 -04:00

libgcc-initial_arm-11.2.bb

arm-toolchain: update Arm GCC to 11.2

2022-03-23 09:34:09 -04:00

libgfortran_arm-11.2.bb

arm-toolchain: update Arm GCC to 11.2

2022-03-23 09:34:09 -04:00