From 79231dd9f23f3fdf776063b70f08dda017004d2e Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 8 Oct 2017 18:47:14 +0200 Subject: [PATCH] Integrate a Debian patch (armel portability) --- CMakeLists.txt | 1 + tools/cmake/MakeLib.cmake | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2bb276f16..20e8dfbdff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -242,6 +242,7 @@ endif() if(WIN32) set(Boost_USE_STATIC_LIBS 1) endif() + set(HAVE_PAPI 0) if(enable_smpi_papi) include(FindPAPI) diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake index 6aed72c998..2375082fb6 100644 --- a/tools/cmake/MakeLib.cmake +++ b/tools/cmake/MakeLib.cmake @@ -95,6 +95,26 @@ if(enable_smpi AND APPLE) set(SIMGRID_DEP "${SIMGRID_DEP} -Wl,-U -Wl,_smpi_simulated_main") endif() +# See https://github.com/HewlettPackard/foedus_code/blob/master/foedus-core/cmake/FindGccAtomic.cmake +FIND_LIBRARY(GCCLIBATOMIC_LIBRARY NAMES atomic atomic.so.1 libatomic.so.1 + HINTS + $ENV{HOME}/local/lib64 + $ENV{HOME}/local/lib + /usr/local/lib64 + /usr/local/lib + /opt/local/lib64 + /opt/local/lib + /usr/lib64 + /usr/lib + /lib64 + /lib +) + +# Fix a FTBFS on armel, mips, mipsel and friends (Debian's #872881) +if(CMAKE_COMPILER_IS_GNUCC AND GCCLIBATOMIC_LIBRARY) + set(SIMGRID_DEP "${SIMGRID_DEP} -Wl,--as-needed -latomic -Wl,--no-as-needed") +endif() + target_link_libraries(simgrid ${SIMGRID_DEP}) # Dependencies from maintainer mode -- 2.20.1