[meta-security][PATCH] libmhash: fix multilib header conflict - mutils/mhash_config.h

[meta-security][PATCH] libmhash: fix multilib header conflict - mutils/mhash_config.h

[Adrian Zaharia]

Header file conflict between 32-bit and 64-bit versions

Signed-off-by: Adrian Zaharia <Adrian.Zaharia@windriver.com>
---
 recipes-security/libmhash/libmhash_0.9.9.9.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/recipes-security/libmhash/libmhash_0.9.9.9.bb b/recipes-security/libmhash/libmhash_0.9.9.9.bb
index 4d1f584..49139d2 100644
--- a/recipes-security/libmhash/libmhash_0.9.9.9.bb
+++ b/recipes-security/libmhash/libmhash_0.9.9.9.bb
@@ -23,7 +23,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/mhash/mhash-${PV}.tar.bz2 \
 SRC_URI[md5sum] = "f91c74f9ccab2b574a98be5bc31eb280"
 SRC_URI[sha256sum] = "56521c52a9033779154432d0ae47ad7198914785265e1f570cee21ab248dfef0"
 
-inherit autotools-brokensep ptest
+inherit autotools-brokensep ptest multilib_header
+
+do_install:append() {
+    oe_multilib_header mutils/mhash_config.h
+}
 
 do_compile_ptest() {
     if [ ! -d ${S}/demo ]; then mkdir ${S}/demo; fi
-- 
2.39.1

Re: [yocto] [meta-security][PATCH] libmhash: fix multilib header conflict - mutils/mhash_config.h

[akuster808]

On 3/15/23 10:30 AM, Adrian Zaharia wrote:
> Header file conflict between 32-bit and 64-bit versions

Thanks. It will be in my next round of builds.

-armin
>
> Signed-off-by: Adrian Zaharia <Adrian.Zaharia@windriver.com>
> ---
>   recipes-security/libmhash/libmhash_0.9.9.9.bb | 6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/recipes-security/libmhash/libmhash_0.9.9.9.bb b/recipes-security/libmhash/libmhash_0.9.9.9.bb
> index 4d1f584..49139d2 100644
> --- a/recipes-security/libmhash/libmhash_0.9.9.9.bb
> +++ b/recipes-security/libmhash/libmhash_0.9.9.9.bb
> @@ -23,7 +23,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/mhash/mhash-${PV}.tar.bz2 \
>   SRC_URI[md5sum] = "f91c74f9ccab2b574a98be5bc31eb280"
>   SRC_URI[sha256sum] = "56521c52a9033779154432d0ae47ad7198914785265e1f570cee21ab248dfef0"
>   
> -inherit autotools-brokensep ptest
> +inherit autotools-brokensep ptest multilib_header
> +
> +do_install:append() {
> +    oe_multilib_header mutils/mhash_config.h
> +}
>   
>   do_compile_ptest() {
>       if [ ! -d ${S}/demo ]; then mkdir ${S}/demo; fi
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#59433): https://lists.yoctoproject.org/g/yocto/message/59433
> Mute This Topic: https://lists.yoctoproject.org/mt/97628630/3616698
> Group Owner: yocto+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [akuster808@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [meta-security][PATCH] libmhash: fix multilib header conflict - mutils/mhash_config.h

[Adrian Zaharia]

[-- Attachment #1: Type: text/plain, Size: 85 bytes --]

Hi Armin,

Is there an ETA for when this patch will be merged?

Thanks,
Adrian

[-- Attachment #2: Type: text/html, Size: 105 bytes --]

Re: [yocto] [meta-security][PATCH] libmhash: fix multilib header conflict - mutils/mhash_config.h

[akuster808]

On 5/2/23 8:23 AM, Adrian Zaharia via lists.yoctoproject.org wrote:
> Hi Armin,
>
> Is there an ETA for when this patch will be merged?

Oh, I had it queue up but must have blown it away.
Thanks for the reminder.

-armin
>
> Thanks,
> Adrian
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#59840): https://lists.yoctoproject.org/g/yocto/message/59840
> Mute This Topic: https://lists.yoctoproject.org/mt/97628630/3616698
> Group Owner: yocto+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [akuster808@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>