mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-09 16:32:16 +00:00
34da641add
License Update: link update from http://support.hdfgroup.org/ftp/HDF5/releases/COPYING_LBNL_HDF5 to https://raw.githubusercontent.com/hdfgroup/hdf5/develop/COPYING_LBNL_HDF5. Rework the patch 0001-cmake-remove-build-flags.patch to fix the build path issue. Add zlib depends to fix the below failure: /build/tmp/work/core2-64-poky-linux/hdf5/1.14.2/recipe-sysroot-native/usr/bin/x86_64-poky-linux/../../libexec/x86_64-poky-linux/gcc/x86_64-poky-linux/13.2.0/ld: bin/libhdf5.so.310.2.0: undefined reference to `inflateEnd' /build/tmp/work/core2-64-poky-linux/hdf5/1.14.2/recipe-sysroot-native/usr/bin/x86_64-poky-linux/../../libexec/x86_64-poky-linux/gcc/x86_64-poky-linux/13.2.0/ld: bin/libhdf5.so.310.2.0: undefined reference to `inflate' /build/tmp/work/core2-64-poky-linux/hdf5/1.14.2/recipe-sysroot-native/usr/bin/x86_64-poky-linux/../../libexec/x86_64-poky-linux/gcc/x86_64-poky-linux/13.2.0/ld: bin/libhdf5.so.310.2.0: undefined reference to `compress2' /build/tmp/work/core2-64-poky-linux/hdf5/1.14.2/recipe-sysroot-native/usr/bin/x86_64-poky-linux/../../libexec/x86_64-poky-linux/gcc/x86_64-poky-linux/13.2.0/ld: bin/libhdf5.so.310.2.0: undefined reference to `inflateInit_' collect2: error: ld returned 1 exit status Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
97 lines
3.8 KiB
Diff
97 lines
3.8 KiB
Diff
From 4fa437782261c0da785d4574ad3a03700f624e66 Mon Sep 17 00:00:00 2001
|
|
From: Mingli Yu <mingli.yu@windriver.com>
|
|
Date: Tue, 19 Sep 2023 02:56:09 +0000
|
|
Subject: [PATCH] cmake: remove build flags
|
|
|
|
Don't generate the build host related info and reemove the build flags
|
|
to improve reproducibility.
|
|
|
|
Upstream-Status: Inappropriate [oe specific]
|
|
|
|
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
|
---
|
|
config/cmake/libhdf5.settings.cmake.in | 18 +++++++++---------
|
|
src/H5make_libsettings.c | 17 -----------------
|
|
2 files changed, 9 insertions(+), 26 deletions(-)
|
|
|
|
diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in
|
|
index f60f0de..f4433c0 100644
|
|
--- a/config/cmake/libhdf5.settings.cmake.in
|
|
+++ b/config/cmake/libhdf5.settings.cmake.in
|
|
@@ -23,23 +23,23 @@ Linking Options:
|
|
----------------
|
|
Libraries: @BUILD_NAME_EXT@
|
|
Statically Linked Executables: @BUILD_STATIC_EXECS@
|
|
- LDFLAGS: @CMAKE_SHARED_LINKER_FLAGS@
|
|
+ LDFLAGS:
|
|
H5_LDFLAGS: @H5_LDFLAGS@
|
|
AM_LDFLAGS: @AM_LDFLAGS@
|
|
Extra libraries: @LINK_LIBS@
|
|
- Archiver: @CMAKE_AR@
|
|
- AR_FLAGS:
|
|
- Ranlib: @CMAKE_RANLIB@
|
|
+ Archiver:
|
|
+ AR_FLAGS:
|
|
+ Ranlib:
|
|
|
|
Languages:
|
|
----------
|
|
C: YES
|
|
- C Compiler: @CMAKE_C_COMPILER@ @CMAKE_C_COMPILER_VERSION@
|
|
+ C Compiler:
|
|
CPPFLAGS: @CPPFLAGS@
|
|
H5_CPPFLAGS: @H5_CPPFLAGS@
|
|
AM_CPPFLAGS: @AM_CPPFLAGS@
|
|
- CFLAGS: @CMAKE_C_FLAGS@
|
|
- H5_CFLAGS: @HDF5_CMAKE_C_FLAGS@
|
|
+ CFLAGS:
|
|
+ H5_CFLAGS:
|
|
AM_CFLAGS: @AM_CFLAGS@
|
|
Shared C Library: @H5_ENABLE_SHARED_LIB@
|
|
Static C Library: @H5_ENABLE_STATIC_LIB@
|
|
@@ -51,11 +51,11 @@ Languages:
|
|
AM Fortran Flags: @AM_FCFLAGS@
|
|
Shared Fortran Library: @H5_ENABLE_SHARED_LIB@
|
|
Static Fortran Library: @H5_ENABLE_STATIC_LIB@
|
|
- Module Directory: @CMAKE_Fortran_MODULE_DIRECTORY@
|
|
+ Module Directory:
|
|
|
|
C++: @HDF5_BUILD_CPP_LIB@
|
|
C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@
|
|
- C++ Flags: @CMAKE_CXX_FLAGS@
|
|
+ C++ Flags:
|
|
H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@
|
|
AM C++ Flags: @AM_CXXFLAGS@
|
|
Shared C++ Library: @H5_ENABLE_SHARED_LIB@
|
|
diff --git a/src/H5make_libsettings.c b/src/H5make_libsettings.c
|
|
index 2661288..7c0f84f 100644
|
|
--- a/src/H5make_libsettings.c
|
|
+++ b/src/H5make_libsettings.c
|
|
@@ -205,23 +205,6 @@ information about the library build configuration\n";
|
|
fprintf(rawoutstream, "/* Generated automatically by H5make_libsettings -- do not edit */\n\n\n");
|
|
fputs(FileHeader, rawoutstream); /*the copyright notice--see top of this file */
|
|
|
|
- fprintf(rawoutstream, " *\n * Created:\t\t%s %2d, %4d\n", month_name[tm->tm_mon], tm->tm_mday,
|
|
- 1900 + tm->tm_year);
|
|
- if (pwd || real_name[0] || host_name[0]) {
|
|
- fprintf(rawoutstream, " *\t\t\t");
|
|
- if (real_name[0])
|
|
- fprintf(rawoutstream, "%s <", real_name);
|
|
-#ifdef H5_HAVE_GETPWUID
|
|
- if (pwd)
|
|
- fputs(pwd->pw_name, rawoutstream);
|
|
-#endif
|
|
- if (host_name[0])
|
|
- fprintf(rawoutstream, "@%s", host_name);
|
|
- if (real_name[0])
|
|
- fprintf(rawoutstream, ">");
|
|
- fputc('\n', rawoutstream);
|
|
- }
|
|
-
|
|
fprintf(rawoutstream, " *\n * Purpose:\t\t");
|
|
|
|
for (s = purpose; *s; s++) {
|
|
--
|
|
2.35.5
|
|
|