diff --git a/extra/cmake/build b/extra/cmake/build index b0298b1c..e942b4cd 100755 --- a/extra/cmake/build +++ b/extra/cmake/build @@ -1,5 +1,7 @@ #!/bin/sh -e +patch -p1 < cmake-no-execinfo.patch + if kiss l cmake; then export DESTDIR="$1" diff --git a/extra/cmake/checksums b/extra/cmake/checksums index c7b9daf9..504cc7e7 100644 --- a/extra/cmake/checksums +++ b/extra/cmake/checksums @@ -1 +1,2 @@ c0e3338bd37e67155b9d1e9526fec326b5c541f74857771b7ffed0c46ad62508 cmake-3.18.1.tar.gz +93f5582efd076673f9bcb3e639bd594e378954a5a3130e5921027ede23c3325c cmake-no-execinfo.patch diff --git a/extra/cmake/patches/cmake-no-execinfo.patch b/extra/cmake/patches/cmake-no-execinfo.patch new file mode 100644 index 00000000..fd1e7156 --- /dev/null +++ b/extra/cmake/patches/cmake-no-execinfo.patch @@ -0,0 +1,52 @@ +diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx +index ed1cdc0..d3afe21 100644 +--- a/Source/kwsys/SystemInformation.cxx ++++ b/Source/kwsys/SystemInformation.cxx +@@ -150,18 +150,8 @@ typedef struct rlimit ResourceLimitType; + # include + #endif + +-#if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE) +-# include +-# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE) +-# include +-# endif +-# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP) +-# include +-# endif +-#else + # undef KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE + # undef KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP +-#endif + + #include // int isdigit(int c); + #include +diff --git a/Source/kwsys/kwsysPlatformTestsCXX.cxx b/Source/kwsys/kwsysPlatformTestsCXX.cxx +index 0bfa20e..0208417 100644 +--- a/Source/kwsys/kwsysPlatformTestsCXX.cxx ++++ b/Source/kwsys/kwsysPlatformTestsCXX.cxx +@@ -102,24 +102,6 @@ int main() + } + #endif + +-#ifdef TEST_KWSYS_CXX_HAS_BACKTRACE +-# if defined(__PATHSCALE__) || defined(__PATHCC__) || \ +- (defined(__LSB_VERSION__) && (__LSB_VERSION__ < 41)) +-backtrace does not work with this compiler or os +-# endif +-# if (defined(__GNUC__) || defined(__PGI)) && !defined(_GNU_SOURCE) +-# define _GNU_SOURCE +-# endif +-# include +-int main() +-{ +- void* stackSymbols[256]; +- backtrace(stackSymbols, 256); +- backtrace_symbols(&stackSymbols[0], 1); +- return 0; +-} +-#endif +- + #ifdef TEST_KWSYS_CXX_HAS_DLADDR + # if (defined(__GNUC__) || defined(__PGI)) && !defined(_GNU_SOURCE) + # define _GNU_SOURCE diff --git a/extra/cmake/sources b/extra/cmake/sources index 7d345b4d..ac303760 100644 --- a/extra/cmake/sources +++ b/extra/cmake/sources @@ -1 +1,2 @@ https://github.com/Kitware/CMake/releases/download/v3.18.1/cmake-3.18.1.tar.gz +patches/cmake-no-execinfo.patch