mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-13 22:05:27 +01:00
0c6171ed68
License-Update: Add attribution to Lawrence Livermore National Laboratory and the United States Department of Energy Drop the Advertizing Clause from COPYING Forward port patches Drop 0001-cross-compiling-support.patch bring in qemu usermode to do runtime pieces of build Delete cached source files, as they are no longer needed Upgrade version info in python3-h5py as well to match the upgraded version number Signed-off-by: Khem Raj <raj.khem@gmail.com>
59 lines
2.4 KiB
Diff
59 lines
2.4 KiB
Diff
From 39572baac462f16b39dc385751d5c642646718d3 Mon Sep 17 00:00:00 2001
|
|
From: Mingli Yu <mingli.yu@windriver.com>
|
|
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 <mingli.yu@windriver.com>
|
|
---
|
|
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
|
|
@@ -45,7 +45,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@
|
|
@@ -52,8 +52,8 @@ Languages:
|
|
@BUILD_FORTRAN_CONDITIONAL_TRUE@ Static Fortran Library: @H5_ENABLE_STATIC_LIB@
|
|
|
|
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@
|