forked from kiss-community/repo
cmake: cleanup
This commit is contained in:
parent
3ac50bc1af
commit
afa0461558
|
@ -1,7 +1,5 @@
|
||||||
#!/bin/sh -e
|
#!/bin/sh -e
|
||||||
|
|
||||||
patch -p1 < cmake-no-execinfo.patch
|
|
||||||
|
|
||||||
if command -v cmake >/dev/null; then
|
if command -v cmake >/dev/null; then
|
||||||
cmake -B build \
|
cmake -B build \
|
||||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||||
|
@ -10,6 +8,7 @@ if command -v cmake >/dev/null; then
|
||||||
-DCMAKE_USE_SYSTEM_EXPAT=True \
|
-DCMAKE_USE_SYSTEM_EXPAT=True \
|
||||||
-DCMAKE_USE_SYSTEM_ZLIB=True \
|
-DCMAKE_USE_SYSTEM_ZLIB=True \
|
||||||
-DCMAKE_USE_SYSTEM_BZIP2=True \
|
-DCMAKE_USE_SYSTEM_BZIP2=True \
|
||||||
|
-DBUILD_CursesDialog=OFF \
|
||||||
-DBUILD_TESTING=OFF
|
-DBUILD_TESTING=OFF
|
||||||
|
|
||||||
cmake --build build
|
cmake --build build
|
||||||
|
@ -21,7 +20,9 @@ else
|
||||||
--system-curl \
|
--system-curl \
|
||||||
--system-expat \
|
--system-expat \
|
||||||
--system-zlib \
|
--system-zlib \
|
||||||
--system-bzip2
|
--system-bzip2 \
|
||||||
|
--parallel="$(grep -scF 'core id' /proc/cpuinfo)" -- \
|
||||||
|
-DBUILD_CursesDialog=OFF
|
||||||
|
|
||||||
make
|
make
|
||||||
make install
|
make install
|
||||||
|
|
|
@ -1,2 +1 @@
|
||||||
4931e277a4db1a805f13baa7013a7757a0cbfe5b7932882925c7061d9d1fa82b
|
4931e277a4db1a805f13baa7013a7757a0cbfe5b7932882925c7061d9d1fa82b
|
||||||
93f5582efd076673f9bcb3e639bd594e378954a5a3130e5921027ede23c3325c
|
|
||||||
|
|
|
@ -1,52 +0,0 @@
|
||||||
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,2 +1 @@
|
||||||
https://cmake.org/files/vMAJOR.MINOR/cmake-VERSION.tar.gz
|
https://cmake.org/files/vMAJOR.MINOR/cmake-VERSION.tar.gz
|
||||||
patches/cmake-no-execinfo.patch
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user