bonsai/repo
4
0
Fork 0
forked from kiss-community/repo
Code Issues 28 Pull Requests 2 Projects Releases Activity

cmake: Don't link against execinfo. Closes #213

Browse Source
This commit is contained in:
Dylan Araps 2020-08-10 10:23:51 +03:00
parent 1445799e16
commit 04d93460b2
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
4 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extra/cmake/build
View File

@ -1,5 +1,7 @@
#!/bin/sh -e
patch -p1 < cmake-no-execinfo.patch
if kiss l cmake; then
export DESTDIR="$1"

1
extra/cmake/checksums
View File

@ -1 +1,2 @@
c0e3338bd37e67155b9d1e9526fec326b5c541f74857771b7ffed0c46ad62508 cmake-3.18.1.tar.gz
93f5582efd076673f9bcb3e639bd594e378954a5a3130e5921027ede23c3325c cmake-no-execinfo.patch

52
extra/cmake/patches/cmake-no-execinfo.patch Normal file
View File

@ -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 <OS.h>
#endif
-#if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
-# include <execinfo.h>
-# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
-# include <cxxabi.h>
-# endif
-# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
-# include <dlfcn.h>
-# endif
-#else
# undef KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE
# undef KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP
-#endif
#include <cctype> // int isdigit(int c);
#include <cstdio>
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 <execinfo.h>
-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

1
extra/cmake/sources
View File

@ -1 +1,2 @@
https://github.com/Kitware/CMake/releases/download/v3.18.1/cmake-3.18.1.tar.gz
patches/cmake-no-execinfo.patch