tools/cmake: Update to 3.9.3
Update CMake to 3.9.3 Remove FreeBSD patch (not needed) Rearrage and update patches Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>v19.07.3_mercusys_ac12_duma
parent
3adafda07c
commit
839129b864
@ -1,39 +0,0 @@
|
|||||||
From 6eab64c3adc7a38c322cd4d9a1a1881f2d49cb9c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
|
|
||||||
Date: Tue, 15 Oct 2013 00:10:56 +0300
|
|
||||||
Subject: [PATCH] SystemInformation: Include backtrace-related headers on
|
|
||||||
FreeBSD
|
|
||||||
|
|
||||||
This was probably broken for a long while, but the problem was not apparent
|
|
||||||
because the check for execinfo.h would fail by default because
|
|
||||||
-I/usr/local/include was not being passed to the compiler when making the
|
|
||||||
checks for the header's existence.
|
|
||||||
|
|
||||||
Now that very recent FreeBSD versions (ie. 10-CURRENT) have NetBSD's
|
|
||||||
libexecinfo in base (and it is thus installed into /usr), the
|
|
||||||
backtrace-related checks would pass, but the required headers were not being
|
|
||||||
included in SystemInformation.cxx.
|
|
||||||
|
|
||||||
Change-Id: I3b91ed7ac0e6878035aee202b3336c536cc6d2ff
|
|
||||||
---
|
|
||||||
Source/kwsys/SystemInformation.cxx | 9 +++++++++
|
|
||||||
1 file changed, 9 insertions(+)
|
|
||||||
|
|
||||||
--- a/Source/kwsys/SystemInformation.cxx
|
|
||||||
+++ b/Source/kwsys/SystemInformation.cxx
|
|
||||||
@@ -82,6 +82,15 @@ typedef int siginfo_t;
|
|
||||||
#include <net/if.h>
|
|
||||||
#define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
|
|
||||||
#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
|
|
||||||
+# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(KWSYS_SYS_HAS_MACHINE_CPU_H)
|
|
@ -1,6 +1,6 @@
|
|||||||
--- a/bootstrap
|
--- a/bootstrap
|
||||||
+++ b/bootstrap
|
+++ b/bootstrap
|
||||||
@@ -1046,7 +1046,10 @@ int main(){ printf("1%c", (char)0x0a); r
|
@@ -1094,7 +1094,10 @@ int main(){ printf("1%c", (char)0x0a); r
|
||||||
' > "test.c"
|
' > "test.c"
|
||||||
cmake_original_make_flags="${cmake_make_flags}"
|
cmake_original_make_flags="${cmake_make_flags}"
|
||||||
if [ "x${cmake_parallel_make}" != "x" ]; then
|
if [ "x${cmake_parallel_make}" != "x" ]; then
|
Loading…
Reference in New Issue