diff options
author | Kai Kang <kai.kang@windriver.com> | 2023-09-01 11:14:24 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-08-31 22:37:31 -0700 |
commit | ea21dd17d2cb80d1f5b2f6d4cef60eb4fe765d58 (patch) | |
tree | fac3d6e3e83f8962a35b1883851d02a535c74275 | |
parent | 87ae6f0c225815706c45482ffc6f0747f8e0dd54 (diff) | |
download | meta-openembedded-ea21dd17d2cb80d1f5b2f6d4cef60eb4fe765d58.tar.gz |
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 <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb | 4 |
1 files changed, 3 insertions, 1 deletions
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 | |||
12 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/mcrypt/files/Libmcrypt/" | 12 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/mcrypt/files/Libmcrypt/" |
13 | UPSTREAM_CHECK_REGEX = "Libmcrypt/(?P<pver>\d+(\.\d+)+)/" | 13 | UPSTREAM_CHECK_REGEX = "Libmcrypt/(?P<pver>\d+(\.\d+)+)/" |
14 | 14 | ||
15 | inherit autotools-brokensep gettext binconfig | 15 | inherit autotools-brokensep gettext binconfig multilib_script |
16 | 16 | ||
17 | CFLAGS += "-Wno-error=implicit-int" | 17 | CFLAGS += "-Wno-error=implicit-int" |
18 | 18 | ||
@@ -28,3 +28,5 @@ do_configure() { | |||
28 | } | 28 | } |
29 | 29 | ||
30 | CLEANBROKEN = "1" | 30 | CLEANBROKEN = "1" |
31 | |||
32 | MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/libmcrypt-config" | ||