diff options
| author | Yogita Urade <yogita.urade@windriver.com> | 2024-08-01 07:10:29 +0000 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2024-08-01 11:43:17 -0700 |
| commit | 17e3e9b8c24ea5669de27cb3f722b6ae1ee7b3ba (patch) | |
| tree | b6969345b9144c3b94d444db7a642be43af1f4e9 | |
| parent | cb6e7cd322cd382ade2692ebfefe3d78bac961be (diff) | |
| download | meta-openembedded-17e3e9b8c24ea5669de27cb3f722b6ae1ee7b3ba.tar.gz | |
hdf5: upgrade to 1.14.4
Release notes:
https://github.com/HDFGroup/hdf5/blob/hdf5_1.14.4.3/release_docs/RELEASE.txt
License update: link update
from https://raw.githubusercontent.com/hdfgroup/hdf5/develop/COPYING_LBNL_HDF5
to https://raw.githubusercontent.com/hdfgroup/hdf5/hdf5_1_14/COPYING_LBNL_HDF5.
Upstream has only Released tar file extension is .gz so
SRC_URI tar file extension changed from .bz2 to .gz
Fixes
File /usr/lib/libhdf5.settings in package hdf5 contains reference to TMPDIR
File /usr/src/debug/hdf5/1.14.4-3/src/H5build_settings.c in package
hdf5-src contains reference to TMPDIR [buildpaths]
- Running H5make_libsettings is no longer required for cross-compiling
The functionality of H5make_libsettings is now handled via template files,
so H5make_libsettings has been removed.
- Running H5detect is no longer required for cross-compiling
The functionality of H5detect is now exercised at library startup,
so H5detect has been removed
Rework the patch 0001-cmake-remove-build-flags.patch to fix the build path
issue.
Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch | 41 | ||||
| -rw-r--r-- | meta-oe/recipes-support/hdf5/hdf5_1.14.4-3.bb (renamed from meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb) | 13 |
2 files changed, 14 insertions, 40 deletions
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 68d9c3a3cf..0d016ccb4c 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 | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | From 4fa437782261c0da785d4574ad3a03700f624e66 Mon Sep 17 00:00:00 2001 | 1 | From 9f5afd99cce93e68996deb2b5fa7c32737d279fe Mon Sep 17 00:00:00 2001 |
| 2 | From: Mingli Yu <mingli.yu@windriver.com> | 2 | From: Mingli Yu <mingli.yu@windriver.com> |
| 3 | Date: Tue, 19 Sep 2023 02:56:09 +0000 | 3 | Date: Tue, 16 Jul 2024 17:54:29 +0800 |
| 4 | Subject: [PATCH] cmake: remove build flags | 4 | Subject: [PATCH] cmake: remove build flags |
| 5 | 5 | ||
| 6 | Don't generate the build host related info and reemove the build flags | 6 | Don't generate the build host related info and reemove the build flags |
| @@ -11,11 +11,10 @@ Upstream-Status: Inappropriate [oe specific] | |||
| 11 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | 11 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
| 12 | --- | 12 | --- |
| 13 | config/cmake/libhdf5.settings.cmake.in | 18 +++++++++--------- | 13 | config/cmake/libhdf5.settings.cmake.in | 18 +++++++++--------- |
| 14 | src/H5make_libsettings.c | 17 ----------------- | 14 | 1 file changed, 9 insertions(+), 9 deletions(-) |
| 15 | 2 files changed, 9 insertions(+), 26 deletions(-) | ||
| 16 | 15 | ||
| 17 | diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in | 16 | diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in |
| 18 | index f60f0de..f4433c0 100644 | 17 | index deb07ed..6f255c4 100644 |
| 19 | --- a/config/cmake/libhdf5.settings.cmake.in | 18 | --- a/config/cmake/libhdf5.settings.cmake.in |
| 20 | +++ b/config/cmake/libhdf5.settings.cmake.in | 19 | +++ b/config/cmake/libhdf5.settings.cmake.in |
| 21 | @@ -23,23 +23,23 @@ Linking Options: | 20 | @@ -23,23 +23,23 @@ Linking Options: |
| @@ -28,7 +27,7 @@ index f60f0de..f4433c0 100644 | |||
| 28 | AM_LDFLAGS: @AM_LDFLAGS@ | 27 | AM_LDFLAGS: @AM_LDFLAGS@ |
| 29 | Extra libraries: @LINK_LIBS@ | 28 | Extra libraries: @LINK_LIBS@ |
| 30 | - Archiver: @CMAKE_AR@ | 29 | - Archiver: @CMAKE_AR@ |
| 31 | - AR_FLAGS: | 30 | - AR_FLAGS: |
| 32 | - Ranlib: @CMAKE_RANLIB@ | 31 | - Ranlib: @CMAKE_RANLIB@ |
| 33 | + Archiver: | 32 | + Archiver: |
| 34 | + AR_FLAGS: | 33 | + AR_FLAGS: |
| @@ -63,34 +62,6 @@ index f60f0de..f4433c0 100644 | |||
| 63 | H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@ | 62 | H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@ |
| 64 | AM C++ Flags: @AM_CXXFLAGS@ | 63 | AM C++ Flags: @AM_CXXFLAGS@ |
| 65 | Shared C++ Library: @H5_ENABLE_SHARED_LIB@ | 64 | Shared C++ Library: @H5_ENABLE_SHARED_LIB@ |
| 66 | diff --git a/src/H5make_libsettings.c b/src/H5make_libsettings.c | ||
| 67 | index 2661288..7c0f84f 100644 | ||
| 68 | --- a/src/H5make_libsettings.c | ||
| 69 | +++ b/src/H5make_libsettings.c | ||
| 70 | @@ -205,23 +205,6 @@ information about the library build configuration\n"; | ||
| 71 | fprintf(rawoutstream, "/* Generated automatically by H5make_libsettings -- do not edit */\n\n\n"); | ||
| 72 | fputs(FileHeader, rawoutstream); /*the copyright notice--see top of this file */ | ||
| 73 | |||
| 74 | - fprintf(rawoutstream, " *\n * Created:\t\t%s %2d, %4d\n", month_name[tm->tm_mon], tm->tm_mday, | ||
| 75 | - 1900 + tm->tm_year); | ||
| 76 | - if (pwd || real_name[0] || host_name[0]) { | ||
| 77 | - fprintf(rawoutstream, " *\t\t\t"); | ||
| 78 | - if (real_name[0]) | ||
| 79 | - fprintf(rawoutstream, "%s <", real_name); | ||
| 80 | -#ifdef H5_HAVE_GETPWUID | ||
| 81 | - if (pwd) | ||
| 82 | - fputs(pwd->pw_name, rawoutstream); | ||
| 83 | -#endif | ||
| 84 | - if (host_name[0]) | ||
| 85 | - fprintf(rawoutstream, "@%s", host_name); | ||
| 86 | - if (real_name[0]) | ||
| 87 | - fprintf(rawoutstream, ">"); | ||
| 88 | - fputc('\n', rawoutstream); | ||
| 89 | - } | ||
| 90 | - | ||
| 91 | fprintf(rawoutstream, " *\n * Purpose:\t\t"); | ||
| 92 | |||
| 93 | for (s = purpose; *s; s++) { | ||
| 94 | -- | 65 | -- |
| 95 | 2.35.5 | 66 | 2.25.1 |
| 96 | 67 | ||
diff --git a/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb b/meta-oe/recipes-support/hdf5/hdf5_1.14.4-3.bb index b8a81bb0b7..f34e5f183d 100644 --- a/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb +++ b/meta-oe/recipes-support/hdf5/hdf5_1.14.4-3.bb | |||
| @@ -5,18 +5,18 @@ HOMEPAGE = "https://www.hdfgroup.org/" | |||
| 5 | SECTION = "libs" | 5 | SECTION = "libs" |
| 6 | 6 | ||
| 7 | LICENSE = "HDF5" | 7 | LICENSE = "HDF5" |
| 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=9ba0f3d878ab6c2403c86e9b0362d998" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=adebb1ecf1b3b80c13359e18ef67301e" |
| 9 | 9 | ||
| 10 | inherit cmake siteinfo qemu multilib_header multilib_script | 10 | inherit cmake siteinfo qemu multilib_header multilib_script |
| 11 | 11 | ||
| 12 | DEPENDS += "qemu-native zlib" | 12 | DEPENDS += "qemu-native zlib" |
| 13 | 13 | ||
| 14 | SRC_URI = " \ | 14 | SRC_URI = " \ |
| 15 | https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-${PV}/src/${BPN}-${PV}.tar.bz2 \ | 15 | https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-1.14.4/src/${BPN}-${PV}.tar.gz \ |
| 16 | file://0002-Remove-suffix-shared-from-shared-library-name.patch \ | 16 | file://0002-Remove-suffix-shared-from-shared-library-name.patch \ |
| 17 | file://0001-cmake-remove-build-flags.patch \ | 17 | file://0001-cmake-remove-build-flags.patch \ |
| 18 | " | 18 | " |
| 19 | SRC_URI[sha256sum] = "ea3c5e257ef322af5e77fc1e52ead3ad6bf3bb4ac06480dd17ee3900d7a24cfb" | 19 | SRC_URI[sha256sum] = "019ac451d9e1cf89c0482ba2a06f07a46166caf23f60fea5ef3c37724a318e03" |
| 20 | 20 | ||
| 21 | FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*" | 21 | FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*" |
| 22 | 22 | ||
| @@ -44,10 +44,13 @@ MULTILIB_SCRIPTS += "${PN}:${bindir}/h5cc \ | |||
| 44 | ${PN}:${bindir}/h5hlcc \ | 44 | ${PN}:${bindir}/h5hlcc \ |
| 45 | " | 45 | " |
| 46 | 46 | ||
| 47 | do_configure:append() { | ||
| 48 | sed -i -e 's|${WORKDIR}||g' ${B}/src/libhdf5.settings | ||
| 49 | sed -i -e 's|${WORKDIR}||g' ${B}/src/H5build_settings.c | ||
| 50 | } | ||
| 51 | |||
| 47 | do_install:append() { | 52 | do_install:append() { |
| 48 | # Used for generating config files on target | 53 | # Used for generating config files on target |
| 49 | install -m 755 ${B}/bin/H5detect ${D}${bindir} | ||
| 50 | install -m 755 ${B}/bin/H5make_libsettings ${D}${bindir} | ||
| 51 | oe_multilib_header H5pubconf.h | 54 | oe_multilib_header H5pubconf.h |
| 52 | # remove the buildpath | 55 | # remove the buildpath |
| 53 | sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/pkgconfig/hdf5.pc | 56 | sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/pkgconfig/hdf5.pc |
