diff mbox series

[meta-oe] libmcrypt: fix multilib conflict

Message ID 20230901031424.1443331-1-kai.kang@windriver.com
State Under Review
Headers show
Series [meta-oe] libmcrypt: fix multilib conflict | expand

Commit Message

Kai Sept. 1, 2023, 3:14 a.m. UTC 
From: Kai Kang <kai.kang@windriver.com>

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 <kai.kang@windriver.com>
---
 meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox series

Patch

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 a3d09c7cb..cfa056d71 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<pver>\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"