Skip to contentSkip to conversation

gcc-target.inc: fix multilib conflict

PATCH In review Changqing Li 2 participants 2 messages Aug 14, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gcc-target.inc: fix multilib conflict

From: Changqing Li <[email protected]>

fix below error:
file /usr/bin/g++ conflicts between attempted installs of lib32-g++-symlinks-10.1.0-r0.core2_32 and g++-symlinks-10.1.0-r0.core2_64 file /usr/bin/gcc conflicts between attempted installs of lib32-gcc-symlinks-10.1.0-r0.core2_32 and gcc-symlinks-10.1.0-r0.core2_64 file /usr/bin/cpp conflicts between attempted installs of lib32-cpp-symlinks-10.1.0-r0.core2_32 and cpp-symlinks-10.1.0-r0.core2_64

---
 meta/recipes-devtools/gcc/gcc-target.inc | 4 ++++
 1 file changed, 4 insertions(+)
meta/recipes-devtools/gcc/gcc-target.inc +4 -0
index 1e25dad86b..03057dc71b 100644
@@ -28,6 +28,10 @@ export gcc_cv_objdump = "${TARGET_PREFIX}objdump"
 
 EXTRA_OECONF_GCC_FLOAT = "${@get_gcc_float_setting(bb, d)}"
 
+inherit multilib_script
+MULTILIB_SCRIPTS += " ${MLPREFIX}g++-symlinks:${bindir}/g++ ${MLPREFIX}gcc-symlinks:${bindir}/gcc \
+                      ${MLPREFIX}cpp-symlinks:${bindir}/cpp"
+
 PACKAGES = "\
     ${PN} ${PN}-plugins ${PN}-symlinks \
     g++ g++-symlinks \
Signature · 1 line
2.17.1
#1 lore raw
Quoted 17 lines · Changqing Li

From: Changqing Li <[email protected]>

fix below error:
file /usr/bin/g++ conflicts between attempted installs of lib32-g++-symlinks-10.1.0-r0.core2_32 and g++-symlinks-10.1.0-r0.core2_64 file /usr/bin/gcc conflicts between attempted installs of lib32-gcc-symlinks-10.1.0-r0.core2_32 and gcc-symlinks-10.1.0-r0.core2_64 file /usr/bin/cpp conflicts between attempted installs of lib32-cpp-symlinks-10.1.0-r0.core2_32 and cpp-symlinks-10.1.0-r0.core2_64

---
 meta/recipes-devtools/gcc/gcc-target.inc | 4 ++++
 1 file changed, 4 insertions(+)
meta/recipes-devtools/gcc/gcc-target.inc +0 -0
index 1e25dad86b..03057dc71b 100644

meta/recipes-devtools/gcc/gcc-target.inc export gcc_cv_objdump = "${TARGET_PREFIX}objdump" · line 37

Quoted 10 lines
meta/recipes-devtools/gcc/gcc-target.inc +4 -0
@@ -28,6 +28,10 @@ export gcc_cv_objdump = "${TARGET_PREFIX}objdump"
 
 EXTRA_OECONF_GCC_FLOAT = "${@get_gcc_float_setting(bb, d)}"
 
+inherit multilib_script
+MULTILIB_SCRIPTS += " ${MLPREFIX}g++-symlinks:${bindir}/g++ ${MLPREFIX}gcc-symlinks:${bindir}/gcc \
+                      ${MLPREFIX}cpp-symlinks:${bindir}/cpp"
+
 PACKAGES = "\
     ${PN} ${PN}-plugins ${PN}-symlinks \
     g++ g++-symlinks \

Surely you just shouldn't be installing both of these? Adding multilib_script just create symlinks of symlinks. Perhaps one should REPLACES the other?

We really don't want to create a tangled mess of symlinks though.

Cheers,

Richard