diff options
author | Mingli Yu <mingli.yu@windriver.com> | 2021-08-04 17:15:18 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-08-04 09:13:31 -0700 |
commit | 4685ce7a3f1f6c574091a1041106bb277f709288 (patch) | |
tree | 15160fe70a505ba74d59ba1ec2a41d923491de36 | |
parent | db46441c5f155ddafb219ad4739b83b9080feacd (diff) | |
download | meta-openembedded-4685ce7a3f1f6c574091a1041106bb277f709288.tar.gz |
hdf5: improve reproducibility
Remove the build flags to improve reproducibility.
Signed-off-by: Mingli Yu <mingli.yu@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 | 65 | ||||
-rw-r--r-- | meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb | 1 |
2 files changed, 66 insertions, 0 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 new file mode 100644 index 000000000..288e642fc --- /dev/null +++ b/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch | |||
@@ -0,0 +1,65 @@ | |||
1 | From 39572baac462f16b39dc385751d5c642646718d3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
3 | Date: Wed, 4 Aug 2021 17:05:10 +0800 | ||
4 | Subject: [PATCH] cmake: remove build flags | ||
5 | |||
6 | Remove the build flags to improve reproducibility. | ||
7 | |||
8 | Upstream-Status: Inappropriate[oe specific] | ||
9 | |||
10 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
11 | --- | ||
12 | config/cmake/libh5cc.in | 2 +- | ||
13 | config/cmake/libhdf5.settings.cmake.in | 12 ++++++------ | ||
14 | 2 files changed, 7 insertions(+), 7 deletions(-) | ||
15 | |||
16 | diff --git a/config/cmake/libh5cc.in b/config/cmake/libh5cc.in | ||
17 | index f462d56..93c7137 100644 | ||
18 | --- a/config/cmake/libh5cc.in | ||
19 | +++ b/config/cmake/libh5cc.in | ||
20 | @@ -29,4 +29,4 @@ printf 'dir is %s\n' "$dir" | ||
21 | |||
22 | export PKG_CONFIG_PATH=$dir/lib/pkgconfig | ||
23 | |||
24 | -@_PKG_CONFIG_COMPILER@ `pkg-config --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@-@_PKG_CONFIG_VERSION@` $@ | ||
25 | +`pkg-config --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@-@_PKG_CONFIG_VERSION@` $@ | ||
26 | diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in | ||
27 | index c337dea..0ab9066 100644 | ||
28 | --- a/config/cmake/libhdf5.settings.cmake.in | ||
29 | +++ b/config/cmake/libhdf5.settings.cmake.in | ||
30 | @@ -16,8 +16,8 @@ General Information: | ||
31 | Compiling Options: | ||
32 | ------------------ | ||
33 | Compilation Mode: @CMAKE_BUILD_TYPE@ @CMAKE_C_COMPILER_VERSION@ | ||
34 | - C Compiler: @CMAKE_C_COMPILER@ | ||
35 | - CFLAGS: @CMAKE_C_FLAGS@ | ||
36 | + C Compiler: | ||
37 | + CFLAGS: | ||
38 | H5_CFLAGS: @H5_CFLAGS@ | ||
39 | AM_CFLAGS: @AM_CFLAGS@ | ||
40 | CPPFLAGS: @CPPFLAGS@ | ||
41 | @@ -29,8 +29,8 @@ Compiling Options: | ||
42 | LDFLAGS: @CMAKE_SHARED_LINKER_FLAGS@ | ||
43 | AM_LDFLAGS: @AM_LDFLAGS@ | ||
44 | Extra libraries: @LINK_LIBS@ | ||
45 | - Archiver: @CMAKE_AR@ | ||
46 | - Ranlib: @CMAKE_RANLIB@ | ||
47 | + Archiver: | ||
48 | + Ranlib: | ||
49 | Debugged Packages: @DEBUG_PKG@ | ||
50 | API Tracing: @HDF5_ENABLE_TRACE@ | ||
51 | |||
52 | @@ -46,8 +46,8 @@ Languages: | ||
53 | @BUILD_FORTRAN_CONDITIONAL_TRUE@ Static Fortran Library: YES | ||
54 | |||
55 | C++: @HDF5_BUILD_CPP_LIB@ | ||
56 | -@BUILD_CXX_CONDITIONAL_TRUE@ C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@ | ||
57 | -@BUILD_CXX_CONDITIONAL_TRUE@ C++ Flags: @CMAKE_CXX_FLAGS@ | ||
58 | +@BUILD_CXX_CONDITIONAL_TRUE@ C++ Compiler: | ||
59 | +@BUILD_CXX_CONDITIONAL_TRUE@ C++ Flags: | ||
60 | @BUILD_CXX_CONDITIONAL_TRUE@ H5 C++ Flags: @H5_CXXFLAGS@ | ||
61 | @BUILD_CXX_CONDITIONAL_TRUE@ AM C++ Flags: @AM_CXXFLAGS@ | ||
62 | @BUILD_CXX_CONDITIONAL_TRUE@ Shared C++ Library: @H5_ENABLE_SHARED_LIB@ | ||
63 | -- | ||
64 | 2.17.1 | ||
65 | |||
diff --git a/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb b/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb index b1de0d8b7..7b886a463 100644 --- a/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb +++ b/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb | |||
@@ -16,6 +16,7 @@ SRC_URI = " \ | |||
16 | file://H5Tinit-32.c \ | 16 | file://H5Tinit-32.c \ |
17 | file://0001-cross-compiling-support.patch \ | 17 | file://0001-cross-compiling-support.patch \ |
18 | file://0002-Remove-suffix-shared-from-shared-library-name.patch \ | 18 | file://0002-Remove-suffix-shared-from-shared-library-name.patch \ |
19 | file://0001-cmake-remove-build-flags.patch \ | ||
19 | " | 20 | " |
20 | SRC_URI[md5sum] = "2d2408f2a9dfb5c7b79998002e9a90e9" | 21 | SRC_URI[md5sum] = "2d2408f2a9dfb5c7b79998002e9a90e9" |
21 | SRC_URI[sha256sum] = "e5b1b1dee44a64b795a91c3321ab7196d9e0871fe50d42969761794e3899f40d" | 22 | SRC_URI[sha256sum] = "e5b1b1dee44a64b795a91c3321ab7196d9e0871fe50d42969761794e3899f40d" |