Skip to content

Commit fc7666e

Browse files
wangmingyu84kraj
authored andcommitted
hdf5: Fix install conflict when enable multilib.
Error: Transaction test error: file /usr/bin/h5cc conflicts between attempted installs of lib32-hdf5-1.14.2-r0.armv7ahf_neon and hdf5-1.14.2-r0.cortexa57 file /usr/bin/h5hlcc conflicts between attempted installs of lib32-hdf5-1.14.2-r0.armv7ahf_neon and hdf5-1.14.2-r0.cortexa57 The differences of h5cc are as follows: @@ -44,7 +44,7 @@ exit $status ;; *) - /usr/bin/arm-pokymllib32-linux-gnueabi/arm-pokymllib32-linux-gnueabi-clang $@ `pkg-config --define-variable=prefix=$dir --cflags --libs hdf5` + /usr/bin/aarch64-poky-linux/aarch64-poky-linux-clang $@ `pkg-config --define-variable=prefix=$dir --cflags --libs hdf5` status=$? exit $status ;; The differences of h5hlcc are as follows: @@ -44,7 +44,7 @@ exit $status ;; *) - /usr/bin/arm-pokymllib32-linux-gnueabi/arm-pokymllib32-linux-gnueabi-clang $@ `pkg-config --define-variable=prefix=$dir --cflags --libs hdf5_hl` + /usr/bin/aarch64-poky-linux/aarch64-poky-linux-clang $@ `pkg-config --define-variable=prefix=$dir --cflags --libs hdf5_hl` status=$? exit $status ;; Signed-off-by: Wang Mingyu <[email protected]> Signed-off-by: Khem Raj <[email protected]>
1 parent 2d02f28 commit fc7666e

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SECTION = "libs"
77
LICENSE = "HDF5"
88
LIC_FILES_CHKSUM = "file://COPYING;md5=9ba0f3d878ab6c2403c86e9b0362d998"
99

10-
inherit cmake siteinfo qemu multilib_header
10+
inherit cmake siteinfo qemu multilib_header multilib_script
1111

1212
DEPENDS += "qemu-native zlib"
1313

@@ -40,6 +40,10 @@ EOF
4040

4141
do_unpack[postfuncs] += "gen_emu"
4242

43+
MULTILIB_SCRIPTS += "${PN}:${bindir}/h5cc \
44+
${PN}:${bindir}/h5hlcc \
45+
"
46+
4347
do_install:append() {
4448
# Used for generating config files on target
4549
install -m 755 ${B}/bin/H5detect ${D}${bindir}

0 commit comments

Comments
 (0)