Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 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 | |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame] | 8 | Upstream-Status: Inappropriate [oe specific] |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 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 | |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 16 | --- a/config/cmake/libh5cc.in |
| 17 | +++ b/config/cmake/libh5cc.in |
Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame] | 18 | @@ -45,7 +45,7 @@ for arg in $@ ; do |
| 19 | exit $status |
| 20 | ;; |
| 21 | *) |
| 22 | - @_PKG_CONFIG_COMPILER@ $@ `pkg-config --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@` |
| 23 | + `pkg-config --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@-@_PKG_CONFIG_VERSION@` $@ |
| 24 | status=$? |
| 25 | exit $status |
| 26 | ;; |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 27 | --- a/config/cmake/libhdf5.settings.cmake.in |
| 28 | +++ b/config/cmake/libhdf5.settings.cmake.in |
Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame] | 29 | @@ -27,14 +27,14 @@ Linking Options: |
| 30 | H5_LDFLAGS: @H5_LDFLAGS@ |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 31 | AM_LDFLAGS: @AM_LDFLAGS@ |
| 32 | Extra libraries: @LINK_LIBS@ |
| 33 | - Archiver: @CMAKE_AR@ |
| 34 | - Ranlib: @CMAKE_RANLIB@ |
| 35 | + Archiver: |
| 36 | + Ranlib: |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 37 | |
Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame] | 38 | Languages: |
| 39 | ---------- |
| 40 | C: YES |
| 41 | - C Compiler: @CMAKE_C_COMPILER@ @CMAKE_C_COMPILER_VERSION@ |
| 42 | - CPPFLAGS: @CPPFLAGS@ |
| 43 | + C Compiler: |
| 44 | + CPPFLAGS: |
| 45 | H5_CPPFLAGS: @H5_CPPFLAGS@ |
| 46 | AM_CPPFLAGS: @AM_CPPFLAGS@ |
| 47 | CFLAGS: @CMAKE_C_FLAGS@ |
| 48 | @@ -52,8 +52,8 @@ Languages: |
| 49 | @BUILD_FORTRAN_CONDITIONAL_TRUE@ Static Fortran Library: @H5_ENABLE_STATIC_LIB@ |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 50 | |
| 51 | C++: @HDF5_BUILD_CPP_LIB@ |
| 52 | -@BUILD_CXX_CONDITIONAL_TRUE@ C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@ |
| 53 | -@BUILD_CXX_CONDITIONAL_TRUE@ C++ Flags: @CMAKE_CXX_FLAGS@ |
| 54 | +@BUILD_CXX_CONDITIONAL_TRUE@ C++ Compiler: |
| 55 | +@BUILD_CXX_CONDITIONAL_TRUE@ C++ Flags: |
Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame] | 56 | @BUILD_CXX_CONDITIONAL_TRUE@ H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@ |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 57 | @BUILD_CXX_CONDITIONAL_TRUE@ AM C++ Flags: @AM_CXXFLAGS@ |
| 58 | @BUILD_CXX_CONDITIONAL_TRUE@ Shared C++ Library: @H5_ENABLE_SHARED_LIB@ |