johu 14/08/21 19:42:36
Added: cmake-2.8.12.2-fbsd.patch
cmake-2.8.12.2-python34.patch
Log:
Revision bump adds two upstreams patches. Fix build on fbsd spotted by Yuta
SATOH <nig...@gentoo.gr.jp>, bug #492758. Fix finding Python 3.4 spotted by
Jonas Jelten <jonas.jel...@gmail.com>, bug #519522.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key
0xF3CFD2BD)
Revision Changes Path
1.1 dev-util/cmake/files/cmake-2.8.12.2-fbsd.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.12.2-fbsd.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.12.2-fbsd.patch?rev=1.1&content-type=text/plain
Index: cmake-2.8.12.2-fbsd.patch
===================================================================
From: KWSys Robot <kwro...@kitware.com>
Date: Tue, 15 Oct 2013 12:43:32 +0000 (-0400)
Subject: KWSys 2013-10-15 (6eab64c3)
X-Git-Tag: v3.0.0-rc1~178^2^2~5
X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=c01e7445
KWSys 2013-10-15 (6eab64c3)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ 6eab64c3 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 96b2f6f4..6eab64c3
Raphael Kubo da Costa (1):
6eab64c3 SystemInformation: Include backtrace-related headers on FreeBSD
Change-Id: Ib0447aab3d6555ce278f0c1417af2c53e6f181a5
---
diff --git a/Source/kwsys/SystemInformation.cxx
b/Source/kwsys/SystemInformation.cxx
index 7c31f3a..2672730 100644
--- a/Source/kwsys/SystemInformation.cxx
+++ b/Source/kwsys/SystemInformation.cxx
@@ -88,6 +88,15 @@ typedef int siginfo_t;
# include <ifaddrs.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(__OpenBSD__) || defined(__NetBSD__)
1.1 dev-util/cmake/files/cmake-2.8.12.2-python34.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.12.2-python34.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.12.2-python34.patch?rev=1.1&content-type=text/plain
Index: cmake-2.8.12.2-python34.patch
===================================================================
commit ab6201ab647c13fee44c44822b8502e9848faaaf
Author: Matt McCormick <matt.mccorm...@kitware.com>
Date: Wed Mar 5 17:41:47 2014 -0500
FindPython{Interp,Libs}: Search for Python 3.4.
Python 3.4.0rnc1 was released on 2014-02-20.
diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
index 8da848c..e23a58b 100644
--- a/Modules/FindPythonInterp.cmake
+++ b/Modules/FindPythonInterp.cmake
@@ -47,7 +47,7 @@ unset(_Python_NAMES)
set(_PYTHON1_VERSIONS 1.6 1.5)
set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
-set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
+set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
if(PythonInterp_FIND_VERSION)
if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index 0749efc..1dbc967 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -51,7 +51,7 @@ CMAKE_FIND_FRAMEWORKS(Python)
set(_PYTHON1_VERSIONS 1.6 1.5)
set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
-set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
+set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
if(PythonLibs_FIND_VERSION)
if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
