diff mbox series

[v2] libunwind: fix multilib conflict

Message ID 20250516092238.1182-1-liuyd.fnst@fujitsu.com
State New
Headers show
Series [v2] libunwind: fix multilib conflict | expand

Commit Message

Yiding Liu (Fujitsu) May 16, 2025, 9:22 a.m. UTC
fix issue that
| Error: Transaction test error:
|   file /usr/libexec/libunwind/check-namespace.sh conflicts between attempted installs of libunwind-1.8.1-r0.core2_64 and lib32-libunwind-1.8.1-r0.core2_32
|   file /usr/libexec/libunwind/test-runner conflicts between attempted installs of libunwind-1.8.1-r0.core2_64 and lib32-libunwind-1.8.1-r0.core2_32

Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
---
 meta/recipes-support/libunwind/libunwind_1.8.1.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Ross Burton May 16, 2025, 9:32 a.m. UTC | #1
On 16 May 2025, at 10:22, Yiding Liu (Fujitsu) via lists.openembedded.org <liuyd.fnst=fujitsu.com@lists.openembedded.org> wrote:
> 
> fix issue that
> | Error: Transaction test error:
> |   file /usr/libexec/libunwind/check-namespace.sh conflicts between attempted installs of libunwind-1.8.1-r0.core2_64 and lib32-libunwind-1.8.1-r0.core2_32
> |   file /usr/libexec/libunwind/test-runner conflicts between attempted installs of libunwind-1.8.1-r0.core2_64 and lib32-libunwind-1.8.1-r0.core2_32

The clue is in the names: these are test binaries that should be in libunwind-ptest.   Please don’t immediately reach for multilib_script when that is actually a last resort.

Ross
diff mbox series

Patch

diff --git a/meta/recipes-support/libunwind/libunwind_1.8.1.bb b/meta/recipes-support/libunwind/libunwind_1.8.1.bb
index 68d7a98ee4..e8c5a3d474 100644
--- a/meta/recipes-support/libunwind/libunwind_1.8.1.bb
+++ b/meta/recipes-support/libunwind/libunwind_1.8.1.bb
@@ -19,7 +19,7 @@  SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \
 
 SRC_URI[sha256sum] = "ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157"
 
-inherit autotools multilib_header github-releases
+inherit autotools multilib_header github-releases multilib_script
 
 COMPATIBLE_HOST:riscv32 = "null"
 
@@ -30,6 +30,9 @@  PACKAGECONFIG[latexdocs] = "--enable-documentation, --disable-documentation, lat
 
 EXTRA_OECONF = "--enable-static"
 
+MULTILIB_SCRIPTS = "${PN}:${libexecdir}/libunwind/check-namespace.sh \
+                    ${PN}:${libexecdir}/libunwind/test-runner"
+
 # http://errors.yoctoproject.org/Errors/Details/20487/
 ARM_INSTRUCTION_SET:armv4 = "arm"
 ARM_INSTRUCTION_SET:armv5 = "arm"