summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYogita Urade <yogita.urade@windriver.com>2024-08-01 07:10:29 +0000
committerArmin Kuster <akuster808@gmail.com>2024-08-03 12:15:31 -0400
commit8f59b84cdd08ffb8c3b4646188f9580aa3d2a608 (patch)
treecf246b389a7010d395bcd8de46ffae757ebdcbea
parent332fde8f4c92d47c456fe6a4e799bfbc5e48dcf0 (diff)
downloadmeta-openembedded-8f59b84cdd08ffb8c3b4646188f9580aa3d2a608.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: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch41
-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 @@
1From 4fa437782261c0da785d4574ad3a03700f624e66 Mon Sep 17 00:00:00 2001 1From 9f5afd99cce93e68996deb2b5fa7c32737d279fe Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com> 2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Tue, 19 Sep 2023 02:56:09 +0000 3Date: Tue, 16 Jul 2024 17:54:29 +0800
4Subject: [PATCH] cmake: remove build flags 4Subject: [PATCH] cmake: remove build flags
5 5
6Don't generate the build host related info and reemove the build flags 6Don't generate the build host related info and reemove the build flags
@@ -11,11 +11,10 @@ Upstream-Status: Inappropriate [oe specific]
11Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 11Signed-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
17diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in 16diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in
18index f60f0de..f4433c0 100644 17index 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@
66diff --git a/src/H5make_libsettings.c b/src/H5make_libsettings.c
67index 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--
952.35.5 662.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/"
5SECTION = "libs" 5SECTION = "libs"
6 6
7LICENSE = "HDF5" 7LICENSE = "HDF5"
8LIC_FILES_CHKSUM = "file://COPYING;md5=9ba0f3d878ab6c2403c86e9b0362d998" 8LIC_FILES_CHKSUM = "file://COPYING;md5=adebb1ecf1b3b80c13359e18ef67301e"
9 9
10inherit cmake siteinfo qemu multilib_header multilib_script 10inherit cmake siteinfo qemu multilib_header multilib_script
11 11
12DEPENDS += "qemu-native zlib" 12DEPENDS += "qemu-native zlib"
13 13
14SRC_URI = " \ 14SRC_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"
19SRC_URI[sha256sum] = "ea3c5e257ef322af5e77fc1e52ead3ad6bf3bb4ac06480dd17ee3900d7a24cfb" 19SRC_URI[sha256sum] = "019ac451d9e1cf89c0482ba2a06f07a46166caf23f60fea5ef3c37724a318e03"
20 20
21FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*" 21FILES:${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
47do_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
47do_install:append() { 52do_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