From ebcce220ccb99e6adc01fc0c6c4bcf1979f567e0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 1 Mar 2023 20:19:55 -0800 Subject: hdf5: Upgrade to 1.14.0 Signed-off-by: Khem Raj --- .../hdf5/files/0001-cmake-remove-build-flags.patch | 6 +-- ...ve-suffix-shared-from-shared-library-name.patch | 2 +- meta-oe/recipes-support/hdf5/hdf5_1.13.2.bb | 54 ---------------------- meta-oe/recipes-support/hdf5/hdf5_1.14.0.bb | 54 ++++++++++++++++++++++ 4 files changed, 58 insertions(+), 58 deletions(-) delete mode 100644 meta-oe/recipes-support/hdf5/hdf5_1.13.2.bb create mode 100644 meta-oe/recipes-support/hdf5/hdf5_1.14.0.bb diff --git a/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch b/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch index 642d7d1662..a8050cc55b 100644 --- a/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch +++ b/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch @@ -15,7 +15,7 @@ Signed-off-by: Mingli Yu --- a/config/cmake/libh5cc.in +++ b/config/cmake/libh5cc.in -@@ -45,7 +45,7 @@ for arg in $@ ; do +@@ -44,7 +44,7 @@ for arg in $@ ; do exit $status ;; *) @@ -45,8 +45,8 @@ Signed-off-by: Mingli Yu H5_CPPFLAGS: @H5_CPPFLAGS@ AM_CPPFLAGS: @AM_CPPFLAGS@ CFLAGS: @CMAKE_C_FLAGS@ -@@ -52,8 +52,8 @@ Languages: - @BUILD_FORTRAN_CONDITIONAL_TRUE@ Static Fortran Library: @H5_ENABLE_STATIC_LIB@ +@@ -53,8 +53,8 @@ Languages: + @BUILD_FORTRAN_CONDITIONAL_TRUE@ Module Directory: @CMAKE_Fortran_MODULE_DIRECTORY@ C++: @HDF5_BUILD_CPP_LIB@ -@BUILD_CXX_CONDITIONAL_TRUE@ C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@ diff --git a/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch b/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch index de052451bd..f0eb05a1e7 100644 --- a/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch +++ b/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch @@ -12,7 +12,7 @@ Signed-off-by: Hongxu Jia --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -196,19 +196,19 @@ set (HDF5_HL_F90_C_LIB_TARGET "${HDF +@@ -191,19 +191,19 @@ set (HDF5_HL_F90_C_LIB_TARGET "${HDF set (HDF5_JAVA_JNI_LIB_TARGET "${HDF5_JAVA_JNI_LIB_CORENAME}") set (HDF5_JAVA_HDF5_LIB_TARGET "${HDF5_JAVA_HDF5_LIB_CORENAME}") set (HDF5_JAVA_TEST_LIB_TARGET "${HDF5_JAVA_TEST_LIB_CORENAME}") diff --git a/meta-oe/recipes-support/hdf5/hdf5_1.13.2.bb b/meta-oe/recipes-support/hdf5/hdf5_1.13.2.bb deleted file mode 100644 index 80611c6714..0000000000 --- a/meta-oe/recipes-support/hdf5/hdf5_1.13.2.bb +++ /dev/null @@ -1,54 +0,0 @@ -SUMMARY = "Management suite for extremely large and complex data collections" -DESCRIPTION = "Unique technology suite that makes possible the management of \ -extremely large and complex data collections" -HOMEPAGE = "https://www.hdfgroup.org/" -SECTION = "libs" - -LICENSE = "HDF5" -LIC_FILES_CHKSUM = "file://COPYING;md5=ac1039f6bf7c9ab2b3693836f46d0735" - -inherit cmake siteinfo qemu - -DEPENDS += "qemu-native" - -SRC_URI = " \ - https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.13/hdf5-${PV}/src/${BPN}-${PV}.tar.bz2 \ - file://0002-Remove-suffix-shared-from-shared-library-name.patch \ - file://0001-cmake-remove-build-flags.patch \ -" -SRC_URI[sha256sum] = "9c51b3da426977ec622a43dca8adaf4e81eabf838c1ff80c6225ad1d3ed54b5c" - -FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*" - -EXTRA_OECMAKE = " \ - -DHDF5_INSTALL_CMAKE_DIR=${libdir}/cmake \ - -DCMAKE_INSTALL_PREFIX='${prefix}' \ - -DHDF5_INSTALL_LIB_DIR='${baselib}' \ -" -EXTRA_OECMAKE:prepend:class-target = "-DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper " - -gen_emu() { - # Write out a qemu wrapper that will be used by cmake - # so that it can run target helper binaries through that. - qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" - cat > ${WORKDIR}/qemuwrapper << EOF -#!/bin/sh -$qemu_binary "\$@" -EOF - chmod +x ${WORKDIR}/qemuwrapper -} - -do_unpack[postfuncs] += "gen_emu" - -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} -} - -BBCLASSEXTEND = "native" - -SRC_DISTRIBUTE_LICENSES += "HDF5" - -# h5fuse.sh script needs bash -RDEPENDS:${PN} += "bash" diff --git a/meta-oe/recipes-support/hdf5/hdf5_1.14.0.bb b/meta-oe/recipes-support/hdf5/hdf5_1.14.0.bb new file mode 100644 index 0000000000..4feec61afd --- /dev/null +++ b/meta-oe/recipes-support/hdf5/hdf5_1.14.0.bb @@ -0,0 +1,54 @@ +SUMMARY = "Management suite for extremely large and complex data collections" +DESCRIPTION = "Unique technology suite that makes possible the management of \ +extremely large and complex data collections" +HOMEPAGE = "https://www.hdfgroup.org/" +SECTION = "libs" + +LICENSE = "HDF5" +LIC_FILES_CHKSUM = "file://COPYING;md5=ac1039f6bf7c9ab2b3693836f46d0735" + +inherit cmake siteinfo qemu + +DEPENDS += "qemu-native" + +SRC_URI = " \ + https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-${PV}/src/${BPN}-${PV}.tar.bz2 \ + file://0002-Remove-suffix-shared-from-shared-library-name.patch \ + file://0001-cmake-remove-build-flags.patch \ +" +SRC_URI[sha256sum] = "e4e79433450edae2865a4c6328188bb45391b29d74f8c538ee699f0b116c2ba0" + +FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*" + +EXTRA_OECMAKE = " \ + -DHDF5_INSTALL_CMAKE_DIR=${libdir}/cmake \ + -DCMAKE_INSTALL_PREFIX='${prefix}' \ + -DHDF5_INSTALL_LIB_DIR='${baselib}' \ +" +EXTRA_OECMAKE:prepend:class-target = "-DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper " + +gen_emu() { + # Write out a qemu wrapper that will be used by cmake + # so that it can run target helper binaries through that. + qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" + cat > ${WORKDIR}/qemuwrapper << EOF +#!/bin/sh +$qemu_binary "\$@" +EOF + chmod +x ${WORKDIR}/qemuwrapper +} + +do_unpack[postfuncs] += "gen_emu" + +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} +} + +BBCLASSEXTEND = "native" + +SRC_DISTRIBUTE_LICENSES += "HDF5" + +# h5fuse.sh script needs bash +RDEPENDS:${PN} += "bash" -- cgit v1.2.3-54-g00ecf