From: Changqing Li <[email protected]>

Add pkgconfig-native as DEPENDS explicitly, this can avoid install
conflict when enable multilib when pkgconfig is installed on host,
and also improve build reproducibility

Signed-off-by: Changqing Li <[email protected]>
---
 meta-oe/recipes-support/hdf5/hdf5_2.0.0.bb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/hdf5/hdf5_2.0.0.bb 
b/meta-oe/recipes-support/hdf5/hdf5_2.0.0.bb
index 798ca1b83f..9f77028ce1 100644
--- a/meta-oe/recipes-support/hdf5/hdf5_2.0.0.bb
+++ b/meta-oe/recipes-support/hdf5/hdf5_2.0.0.bb
@@ -7,9 +7,9 @@ SECTION = "libs"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=71a191398102f76050a4e56e78cb4891"
 
-inherit cmake siteinfo qemu multilib_header
+inherit cmake siteinfo qemu multilib_header multilib_script
 
-DEPENDS += "qemu-native zlib"
+DEPENDS += "qemu-native zlib pkgconfig-native"
 
 SRC_URI = 
"https://support.hdfgroup.org/releases/hdf5/v2_0/v2_0_0/downloads/${BPN}-${PV}.tar.gz
 \
            file://0002-Remove-suffix-shared-from-shared-library-name.patch \
@@ -48,8 +48,11 @@ do_configure:append() {
 do_install:append() {
     # Used for generating config files on target
     oe_multilib_header H5pubconf.h
+    sed -i -e 's|${RECIPE_SYSROOT_NATIVE}||g' ${D}${bindir}/h5cc
 }
 
+MULTILIB_SCRIPTS += "${PN}:${bindir}/h5cc"
+
 BBCLASSEXTEND = "native"
 
 # h5fuse.sh script needs bash
-- 
2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#122191): 
https://lists.openembedded.org/g/openembedded-devel/message/122191
Mute This Topic: https://lists.openembedded.org/mt/116552216/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to