From ea21dd17d2cb80d1f5b2f6d4cef60eb4fe765d58 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Fri, 1 Sep 2023 11:14:24 +0800 Subject: [PATCH] libmcrypt: fix multilib conflict It fails to install libmcrypt-dev and lib32-libmcrypt-dev at same time: Error: Transaction test error: file /usr/bin/libmcrypt-config conflicts between attempted installs of libmcrypt-dev-2.5.8-r0.core2_64 and lib32-libmcrypt-dev-2.5.8-r0.i586 Use MULTILIB_SCRIPTS from multilib_script.bbclass to handle them. Signed-off-by: Kai Kang Signed-off-by: Khem Raj --- meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb b/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb index a3d09c7cbd7..cfa056d71d8 100644 --- a/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb +++ b/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb @@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "e4eb6c074bbab168ac47b947c195ff8cef9d51a211cdd18ca9c9ef34d2 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/mcrypt/files/Libmcrypt/" UPSTREAM_CHECK_REGEX = "Libmcrypt/(?P\d+(\.\d+)+)/" -inherit autotools-brokensep gettext binconfig +inherit autotools-brokensep gettext binconfig multilib_script CFLAGS += "-Wno-error=implicit-int" @@ -28,3 +28,5 @@ do_configure() { } CLEANBROKEN = "1" + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/libmcrypt-config"