From 39572baac462f16b39dc385751d5c642646718d3 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Wed, 4 Aug 2021 17:05:10 +0800 Subject: [PATCH] cmake: remove build flags Remove the build flags to improve reproducibility. Upstream-Status: Inappropriate [oe specific] Signed-off-by: Mingli Yu --- config/cmake/libh5cc.in | 2 +- config/cmake/libhdf5.settings.cmake.in | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) --- a/config/cmake/libh5cc.in +++ b/config/cmake/libh5cc.in @@ -44,7 +44,7 @@ for arg in $@ ; do exit $status ;; *) - @_PKG_CONFIG_COMPILER@ $@ `pkg-config --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@` + `pkg-config --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@-@_PKG_CONFIG_VERSION@` $@ status=$? exit $status ;; --- a/config/cmake/libhdf5.settings.cmake.in +++ b/config/cmake/libhdf5.settings.cmake.in @@ -27,14 +27,14 @@ Linking Options: H5_LDFLAGS: @H5_LDFLAGS@ AM_LDFLAGS: @AM_LDFLAGS@ Extra libraries: @LINK_LIBS@ - Archiver: @CMAKE_AR@ - Ranlib: @CMAKE_RANLIB@ + Archiver: + Ranlib: Languages: ---------- C: YES - C Compiler: @CMAKE_C_COMPILER@ @CMAKE_C_COMPILER_VERSION@ - CPPFLAGS: @CPPFLAGS@ + C Compiler: + CPPFLAGS: H5_CPPFLAGS: @H5_CPPFLAGS@ AM_CPPFLAGS: @AM_CPPFLAGS@ CFLAGS: @CMAKE_C_FLAGS@ @@ -53,8 +53,8 @@ Languages: @BUILD_FORTRAN_CONDITIONAL_TRUE@ Module Directory: @CMAKE_Fortran_MODULE_DIRECTORY@ C++: @HDF5_BUILD_CPP_LIB@ -@BUILD_CXX_CONDITIONAL_TRUE@ C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@ -@BUILD_CXX_CONDITIONAL_TRUE@ C++ Flags: @CMAKE_CXX_FLAGS@ +@BUILD_CXX_CONDITIONAL_TRUE@ C++ Compiler: +@BUILD_CXX_CONDITIONAL_TRUE@ C++ Flags: @BUILD_CXX_CONDITIONAL_TRUE@ H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@ @BUILD_CXX_CONDITIONAL_TRUE@ AM C++ Flags: @AM_CXXFLAGS@ @BUILD_CXX_CONDITIONAL_TRUE@ Shared C++ Library: @H5_ENABLE_SHARED_LIB@