| Patrick Williams | 520786c | 2023-06-25 16:20:36 -0500 | [diff] [blame] | 1 | Upstream-Status: Pending |
| 2 | |
| Andrew Geissler | bffdb3e | 2020-08-21 16:13:29 -0500 | [diff] [blame] | 3 | diff -urN -x .git orig/CMakeLists.txt patched/CMakeLists.txt |
| 4 | --- orig/CMakeLists.txt 2020-08-07 21:58:34.656773928 +0900 |
| 5 | +++ patched/CMakeLists.txt 2020-08-10 15:08:31.800278357 +0900 |
| 6 | @@ -119,13 +119,28 @@ |
| 7 | endif() |
| 8 | endif() |
| 9 | |
| 10 | +include(CheckCXXSourceCompiles) |
| 11 | +CHECK_CXX_SOURCE_COMPILES(" |
| 12 | + #include <atomic> |
| 13 | + int main(int argc, char **argv) { |
| 14 | + uint8_t m; |
| 15 | + __atomic_load_8(&m, 0); |
| 16 | + __atomic_fetch_add_1(&m , 0, 0); |
| 17 | + return 0; |
| 18 | + }" |
| 19 | + HAVE_ATOMIC |
| 20 | +) |
| 21 | +if(NOT HAVE_ATOMIC) |
| 22 | + set(LIB_ATOMIC atomic) |
| 23 | +endif() |
| 24 | + |
| 25 | # Use ccache if present |
| 26 | -find_program(CCACHE_FOUND ccache) |
| 27 | -if(CCACHE_FOUND) |
| 28 | - set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) |
| 29 | - set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) |
| 30 | - message("-- Found ccache: ${CCACHE_FOUND}") |
| 31 | -endif(CCACHE_FOUND) |
| 32 | +#find_program(CCACHE_FOUND ccache) |
| 33 | +#if(CCACHE_FOUND) |
| 34 | +# set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) |
| 35 | +# set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) |
| 36 | +# message("-- Found ccache: ${CCACHE_FOUND}") |
| 37 | +#endif(CCACHE_FOUND) |
| 38 | |
| 39 | if (UNIX AND USE_GOLD_LINKER AND NOT APPLE ) |
| 40 | execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version ERROR_QUIET OUTPUT_VARIABLE ld_version) |
| 41 | @@ -303,8 +318,10 @@ |
| 42 | GIT_TAG "f3294d9d86e6a7915a967efff2842089b8b0d071" # Version 7.64.0 |
| 43 | SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/thirdparty/curl-src" |
| 44 | LIST_SEPARATOR % # This is needed for passing semicolon-separated lists |
| 45 | + TLS_VERIFY OFF |
| 46 | CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS} |
| 47 | "-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/thirdparty/curl-install" |
| 48 | + "-DCMAKE_INSTALL_LIBDIR=lib${LIBSUFFIX}" |
| 49 | -DCMAKE_POSITION_INDEPENDENT_CODE=ON |
| 50 | -DBUILD_CURL_EXE=OFF |
| 51 | -DBUILD_TESTING=OFF |
| 52 | diff -urN -x .git orig/libminifi/CMakeLists.txt patched/libminifi/CMakeLists.txt |
| 53 | --- orig/libminifi/CMakeLists.txt 2020-08-07 21:58:34.676773928 +0900 |
| 54 | +++ patched/libminifi/CMakeLists.txt 2020-08-10 15:06:17.124278642 +0900 |
| 55 | @@ -108,6 +108,7 @@ |
| 56 | add_library(spdlog STATIC ${SPD_SOURCES}) |
| 57 | add_library(core-minifi STATIC ${SOURCES}) |
| 58 | target_link_libraries(core-minifi ${CMAKE_DL_LIBS} yaml-cpp) |
| 59 | +target_link_libraries(core-minifi ${LIB_ATOMIC}) |
| 60 | |
| 61 | #target_link_libraries(core-minifi PRIVATE bsdiff ) |
| 62 | |