From: Wang Mingyu <[email protected]> Error: Transaction test error: file /usr/include/H5pubconf.h conflicts between attempted installs of hdf5-dev-1.14.0-r0.core2_64 and lib32-hdf5-dev-1.14.0-r0.i686
The differences between lib32-hdf5-dev and hdf5-dev are as follows: @@ -479,10 +479,10 @@ #define H5_SIZEOF_INT8_T 1 /* The size of `int_fast16_t', as computed by sizeof. */ -#define H5_SIZEOF_INT_FAST16_T 4 +#define H5_SIZEOF_INT_FAST16_T 8 /* The size of `int_fast32_t', as computed by sizeof. */ -#define H5_SIZEOF_INT_FAST32_T 4 +#define H5_SIZEOF_INT_FAST32_T 8 /* The size of `int_fast64_t', as computed by sizeof. */ #define H5_SIZEOF_INT_FAST64_T 8 @@ -505,16 +505,16 @@ #if !defined(__APPLE__) /* The size of `size_t', as computed by sizeof. */ -#define H5_SIZEOF_SIZE_T 4 +#define H5_SIZEOF_SIZE_T 8 /* The size of `ssize_t', as computed by sizeof. */ -#define H5_SIZEOF_SSIZE_T 4 +#define H5_SIZEOF_SSIZE_T 8 /* The size of `long', as computed by sizeof. */ -#define H5_SIZEOF_LONG 4 +#define H5_SIZEOF_LONG 8 /* The size of `long double', as computed by sizeof. */ -#define H5_SIZEOF_LONG_DOUBLE 12 +#define H5_SIZEOF_LONG_DOUBLE 16 #else @@ -538,7 +538,7 @@ # elif defined(__aarch64__) #define H5_SIZEOF_LONG_DOUBLE 8 # else - #define H5_SIZEOF_LONG_DOUBLE 12 + #define H5_SIZEOF_LONG_DOUBLE 16 # endif #endif @@ -557,13 +557,13 @@ #define H5_SIZEOF_OFF_T 8 /* The size of `ptrdiff_t', as computed by sizeof. */ -#define H5_SIZEOF_PTRDIFF_T 4 +#define H5_SIZEOF_PTRDIFF_T 8 /* The size of `short', as computed by sizeof. */ #define H5_SIZEOF_SHORT 2 /* The size of `time_t', as computed by sizeof. */ -#define H5_SIZEOF_TIME_T 4 +#define H5_SIZEOF_TIME_T 8 /* The size of `uint16_t', as computed by sizeof. */ #define H5_SIZEOF_UINT16_T 2 @@ -578,10 +578,10 @@ #define H5_SIZEOF_UINT8_T 1 /* The size of `uint_fast16_t', as computed by sizeof. */ -#define H5_SIZEOF_UINT_FAST16_T 4 +#define H5_SIZEOF_UINT_FAST16_T 8 /* The size of `uint_fast32_t', as computed by sizeof. */ -#define H5_SIZEOF_UINT_FAST32_T 4 +#define H5_SIZEOF_UINT_FAST32_T 8 /* The size of `uint_fast64_t', as computed by sizeof. */ #define H5_SIZEOF_UINT_FAST64_T 8 Signed-off-by: Wang Mingyu <[email protected]> Signed-off-by: Khem Raj <[email protected]> (cherry picked from commit 9d0f892a26aa5d3f754b5cd9af77d4c442ccef12) Signed-off-by: Armin Kuster <[email protected]> --- meta-oe/recipes-support/hdf5/hdf5_1.14.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/hdf5/hdf5_1.14.0.bb b/meta-oe/recipes-support/hdf5/hdf5_1.14.0.bb index 4feec61afd..d0ff2ef487 100644 --- a/meta-oe/recipes-support/hdf5/hdf5_1.14.0.bb +++ b/meta-oe/recipes-support/hdf5/hdf5_1.14.0.bb @@ -7,7 +7,7 @@ SECTION = "libs" LICENSE = "HDF5" LIC_FILES_CHKSUM = "file://COPYING;md5=ac1039f6bf7c9ab2b3693836f46d0735" -inherit cmake siteinfo qemu +inherit cmake siteinfo qemu multilib_header DEPENDS += "qemu-native" @@ -44,6 +44,7 @@ do_install:append() { # Used for generating config files on target install -m 755 ${B}/bin/H5detect ${D}${bindir} install -m 755 ${B}/bin/H5make_libsettings ${D}${bindir} + oe_multilib_header H5pubconf.h } BBCLASSEXTEND = "native" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#102333): https://lists.openembedded.org/g/openembedded-devel/message/102333 Mute This Topic: https://lists.openembedded.org/mt/98744025/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
