Date: Thursday, May 31, 2018 @ 16:56:38 Author: foutrelis Revision: 335009
Fix build with CMake 3.11 Added: kicad/trunk/remove-internal-CheckCXXSymbolExists.patch Modified: kicad/trunk/PKGBUILD --------------------------------------------+ PKGBUILD | 4 + remove-internal-CheckCXXSymbolExists.patch | 59 +++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-05-31 16:56:03 UTC (rev 335008) +++ PKGBUILD 2018-05-31 16:56:38 UTC (rev 335009) @@ -17,13 +17,17 @@ 'kicad-library-3d: for 3d models of components') source=("https://launchpad.net/kicad/4.0/$pkgver/+download/kicad-$pkgver.tar.xz" "kicad-i18n.$pkgver.tar.gz::https://github.com/KiCad/kicad-i18n/archive/$pkgver.tar.gz" + "remove-internal-CheckCXXSymbolExists.patch" "boost-1.61.patch") sha512sums=('7b2acd9efadf5d48565f71bd0df2474ecc8fc04145953c13ac27363d48dbe6b0de091e311713635f603aed89ce0759a1d623abb37a139e2c87184ca4e717145b' '4880705fd7e95c939b7f5e2b7730fd37c426be10596f4cfa80d7df102d9e67232621900395d45f4e735986054f74fb215ae2002a2818faae32b1c75e3cb7e10a' + 'adeb28c59b7b8d9b1383df8eed4e6dcb7cf91c116be3faa29c9c475def3eaf7147bfa11e1a755616be672ad7e730fb71b17399abed80c1af8b600edf71691b78' 'a960117a4c08144de5111e76a33f208a9b3fe702d10ec2546afc57faf3de3fccfe19b5a5c62b527953d55687e644ed67c9b560cd3baf8b678d127977f3f30cee') prepare() { cd "$srcdir/kicad-$pkgver" + # https://bugs.debian.org/897100 + patch -Np1 -i ../remove-internal-CheckCXXSymbolExists.patch # Remove on 4.0.5? Or whenever they finally merge it. patch -Np1 --binary -i ../boost-1.61.patch } Added: remove-internal-CheckCXXSymbolExists.patch =================================================================== --- remove-internal-CheckCXXSymbolExists.patch (rev 0) +++ remove-internal-CheckCXXSymbolExists.patch 2018-05-31 16:56:38 UTC (rev 335009) @@ -0,0 +1,59 @@ +From 2e0b75c058d676f427328506bbf3bc10079da117 Mon Sep 17 00:00:00 2001 +From: Seth Hillbrand <hillbr...@ucdavis.edu> +Date: Fri, 30 Mar 2018 14:47:16 -0700 +Subject: Remove internal CheckCXXSymbolExists + +Since Cmake 2.8.6, Cmake provides this macro. Our use references +internal Cmake variables that have changes in Cmake 3.11. + +diff --git a/CMakeModules/CheckCXXSymbolExists.cmake b/CMakeModules/CheckCXXSymbolExists.cmake +deleted file mode 100644 +index 2100973..0000000 +--- a/CMakeModules/CheckCXXSymbolExists.cmake ++++ /dev/null +@@ -1,42 +0,0 @@ +-# - Check if a symbol exists as a function, variable, or macro in C++ +-# CHECK_CXX_SYMBOL_EXISTS(<symbol> <files> <variable>) +-# +-# Check that the <symbol> is available after including given header +-# <files> and store the result in a <variable>. Specify the list +-# of files in one argument as a semicolon-separated list. +-# CHECK_CXX_SYMBOL_EXISTS() can be used to check in C++ files, as opposed +-# to CHECK_SYMBOL_EXISTS(), which works only for C. +-# +-# If the header files define the symbol as a macro it is considered +-# available and assumed to work. If the header files declare the +-# symbol as a function or variable then the symbol must also be +-# available for linking. If the symbol is a type or enum value +-# it will not be recognized (consider using CheckTypeSize or +-# CheckCSourceCompiles). +-# +-# The following variables may be set before calling this macro to +-# modify the way the check is run: +-# +-# CMAKE_REQUIRED_FLAGS = string of compile command line flags +-# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar) +-# CMAKE_REQUIRED_INCLUDES = list of include directories +-# CMAKE_REQUIRED_LIBRARIES = list of libraries to link +- +-#============================================================================= +-# Copyright 2003-2011 Kitware, Inc. +-# +-# Distributed under the OSI-approved BSD License (the "License"); +-# see accompanying file Copyright.txt for details. +-# +-# This software is distributed WITHOUT ANY WARRANTY; without even the +-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +-# See the License for more information. +-#============================================================================= +-# (To distribute this file outside of CMake, substitute the full +-# License text for the above reference.) +- +-include(CheckSymbolExists) +- +-macro(CHECK_CXX_SYMBOL_EXISTS SYMBOL FILES VARIABLE) +- _CHECK_SYMBOL_EXISTS("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx" "${SYMBOL}" "${FILES}" "${VARIABLE}" ) +-endmacro() +-- +cgit v0.10.2 +