Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame] | 1 | From 4fa437782261c0da785d4574ad3a03700f624e66 Mon Sep 17 00:00:00 2001 |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 2 | From: Mingli Yu <mingli.yu@windriver.com> |
Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame] | 3 | Date: Tue, 19 Sep 2023 02:56:09 +0000 |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 4 | Subject: [PATCH] cmake: remove build flags |
| 5 | |
Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame] | 6 | Don't generate the build host related info and reemove the build flags |
| 7 | to improve reproducibility. |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 8 | |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame] | 9 | Upstream-Status: Inappropriate [oe specific] |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 10 | |
| 11 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
| 12 | --- |
Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame] | 13 | config/cmake/libhdf5.settings.cmake.in | 18 +++++++++--------- |
| 14 | src/H5make_libsettings.c | 17 ----------------- |
| 15 | 2 files changed, 9 insertions(+), 26 deletions(-) |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 16 | |
Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame] | 17 | diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in |
| 18 | index f60f0de..f4433c0 100644 |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 19 | --- a/config/cmake/libhdf5.settings.cmake.in |
| 20 | +++ b/config/cmake/libhdf5.settings.cmake.in |
Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame] | 21 | @@ -23,23 +23,23 @@ Linking Options: |
| 22 | ---------------- |
| 23 | Libraries: @BUILD_NAME_EXT@ |
| 24 | Statically Linked Executables: @BUILD_STATIC_EXECS@ |
| 25 | - LDFLAGS: @CMAKE_SHARED_LINKER_FLAGS@ |
| 26 | + LDFLAGS: |
Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame] | 27 | H5_LDFLAGS: @H5_LDFLAGS@ |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 28 | AM_LDFLAGS: @AM_LDFLAGS@ |
| 29 | Extra libraries: @LINK_LIBS@ |
| 30 | - Archiver: @CMAKE_AR@ |
Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame] | 31 | - AR_FLAGS: |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 32 | - Ranlib: @CMAKE_RANLIB@ |
| 33 | + Archiver: |
Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame] | 34 | + AR_FLAGS: |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 35 | + Ranlib: |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 36 | |
Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame] | 37 | Languages: |
| 38 | ---------- |
| 39 | C: YES |
| 40 | - C Compiler: @CMAKE_C_COMPILER@ @CMAKE_C_COMPILER_VERSION@ |
Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame] | 41 | + C Compiler: |
Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame] | 42 | CPPFLAGS: @CPPFLAGS@ |
Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame] | 43 | H5_CPPFLAGS: @H5_CPPFLAGS@ |
| 44 | AM_CPPFLAGS: @AM_CPPFLAGS@ |
Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame] | 45 | - CFLAGS: @CMAKE_C_FLAGS@ |
| 46 | - H5_CFLAGS: @HDF5_CMAKE_C_FLAGS@ |
| 47 | + CFLAGS: |
| 48 | + H5_CFLAGS: |
| 49 | AM_CFLAGS: @AM_CFLAGS@ |
| 50 | Shared C Library: @H5_ENABLE_SHARED_LIB@ |
| 51 | Static C Library: @H5_ENABLE_STATIC_LIB@ |
| 52 | @@ -51,11 +51,11 @@ Languages: |
| 53 | AM Fortran Flags: @AM_FCFLAGS@ |
| 54 | Shared Fortran Library: @H5_ENABLE_SHARED_LIB@ |
| 55 | Static Fortran Library: @H5_ENABLE_STATIC_LIB@ |
| 56 | - Module Directory: @CMAKE_Fortran_MODULE_DIRECTORY@ |
| 57 | + Module Directory: |
Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 58 | |
| 59 | C++: @HDF5_BUILD_CPP_LIB@ |
Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame] | 60 | C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@ |
| 61 | - C++ Flags: @CMAKE_CXX_FLAGS@ |
| 62 | + C++ Flags: |
| 63 | H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@ |
| 64 | AM C++ Flags: @AM_CXXFLAGS@ |
| 65 | Shared C++ Library: @H5_ENABLE_SHARED_LIB@ |
| 66 | diff --git a/src/H5make_libsettings.c b/src/H5make_libsettings.c |
| 67 | index 2661288..7c0f84f 100644 |
| 68 | --- a/src/H5make_libsettings.c |
| 69 | +++ b/src/H5make_libsettings.c |
| 70 | @@ -205,23 +205,6 @@ information about the library build configuration\n"; |
| 71 | fprintf(rawoutstream, "/* Generated automatically by H5make_libsettings -- do not edit */\n\n\n"); |
| 72 | fputs(FileHeader, rawoutstream); /*the copyright notice--see top of this file */ |
| 73 | |
| 74 | - fprintf(rawoutstream, " *\n * Created:\t\t%s %2d, %4d\n", month_name[tm->tm_mon], tm->tm_mday, |
| 75 | - 1900 + tm->tm_year); |
| 76 | - if (pwd || real_name[0] || host_name[0]) { |
| 77 | - fprintf(rawoutstream, " *\t\t\t"); |
| 78 | - if (real_name[0]) |
| 79 | - fprintf(rawoutstream, "%s <", real_name); |
| 80 | -#ifdef H5_HAVE_GETPWUID |
| 81 | - if (pwd) |
| 82 | - fputs(pwd->pw_name, rawoutstream); |
| 83 | -#endif |
| 84 | - if (host_name[0]) |
| 85 | - fprintf(rawoutstream, "@%s", host_name); |
| 86 | - if (real_name[0]) |
| 87 | - fprintf(rawoutstream, ">"); |
| 88 | - fputc('\n', rawoutstream); |
| 89 | - } |
| 90 | - |
| 91 | fprintf(rawoutstream, " *\n * Purpose:\t\t"); |
| 92 | |
| 93 | for (s = purpose; *s; s++) { |
| 94 | -- |
| 95 | 2.35.5 |
| 96 | |