CVS commit: pkgsrc/cad/kicad

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Sun Jun 24 13:02:00 UTC 2018

Modified Files:
        pkgsrc/cad/kicad: distinfo
Added Files:
        pkgsrc/cad/kicad/patches: patch-CMakeModules_CheckCXXSymbolExists.cmake

Log Message:
Work around patch for missing _CHECK_SYMBOL_EXISTS in cmake-3.11 by @tristelo

https://lists.launchpad.net/kicad-developers/msg35240.html

|     To: Wayne Stambaugh <stambaughw@xxxxxxxxx>
|     From: Seth Hillbrand <seth.hillbrand@xxxxxxxxx>
|     Date: Fri, 30 Mar 2018 14:15:45 -0700
|     Cc: KiCad Developers <kicad-developers@xxxxxxxxxxxxxxxxxxx>
| Hi Adam-
|
| You will need to downgrade to CMake 3.10 or lower.  In 3.11, they revised
| the internals of CheckSymbolExists.
|
| Our macro depends on the internal CMake macro _CHECK_SYMBOL_EXISTS (note
| the underscore at the beginning).  In 3.11, they replaced it with
| __CHECK_SYMBOL_EXISTS_IMPL.
|
| -S

@tristelo, again, provided work around as one line patch at
  https://gist.github.com/steleto/15794a8b623577911b115813b7ef0ec3

Thanks,


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/cad/kicad/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/cad/kicad/patches/patch-CMakeModules_CheckCXXSymbolExists.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/cad/kicad/distinfo
diff -u pkgsrc/cad/kicad/distinfo:1.8 pkgsrc/cad/kicad/distinfo:1.9
--- pkgsrc/cad/kicad/distinfo:1.8       Thu Mar  1 13:59:11 2018
+++ pkgsrc/cad/kicad/distinfo   Sun Jun 24 13:02:00 2018
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.8 2018/03/01 13:59:11 mef Exp $
+$NetBSD: distinfo,v 1.9 2018/06/24 13:02:00 mef Exp $
 
 SHA1 (kicad-4.0.7.tar.xz) = 6e4276edd0761f47008038c5ba8435653b2aee59
 RMD160 (kicad-4.0.7.tar.xz) = 7bd4c81b1bf7ffc4c6d85e37dc5ec710783089d9
 SHA512 (kicad-4.0.7.tar.xz) = 7b2acd9efadf5d48565f71bd0df2474ecc8fc04145953c13ac27363d48dbe6b0de091e311713635f603aed89ce0759a1d623abb37a139e2c87184ca4e717145b
 Size (kicad-4.0.7.tar.xz) = 10678656 bytes
 SHA1 (patch-CMakeLists.txt) = 8b1b7f5fa321958e303dff44bdc2a612085f14b8
+SHA1 (patch-CMakeModules_CheckCXXSymbolExists.cmake) = b77a90db7d8f816714d6eb641d4c31cc3737c503
 SHA1 (patch-CMakeModules_Functions.cmake) = ef22da244c8ed43aec6c149ae6b05a8e464cf809
 SHA1 (patch-CMakeModules_WriteVersionHeader.cmake) = 3ee7e7b121c8691ae5fa3bee03ec62e3ee1aee2b
 SHA1 (patch-CMakeModules_config.h.cmake) = 3988783a0058ed1b5489bc54d903cab2a724f755

Added files:

Index: pkgsrc/cad/kicad/patches/patch-CMakeModules_CheckCXXSymbolExists.cmake
diff -u /dev/null pkgsrc/cad/kicad/patches/patch-CMakeModules_CheckCXXSymbolExists.cmake:1.1
--- /dev/null   Sun Jun 24 13:02:00 2018
+++ pkgsrc/cad/kicad/patches/patch-CMakeModules_CheckCXXSymbolExists.cmake      Sun Jun 24 13:02:00 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-CMakeModules_CheckCXXSymbolExists.cmake,v 1.1 2018/06/24 13:02:00 mef Exp $
+
+Upgrading cmake 3.10 to 3.11 lost the definition of _CHECK_SYMBOL_EXISTS, this makes 
+build fails. Following work around of one line patch is provided by @tristelo.
+Also see 
+https://lists.launchpad.net/kicad-developers/msg35240.html
+
+--- CMakeModules/CheckCXXSymbolExists.cmake.orig       2018-04-14 07:05:29.298280606 +0000
++++ CMakeModules/CheckCXXSymbolExists.cmake
+@@ -38,5 +38,5 @@
+ 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}" )
++  CHECK_SYMBOL_EXISTS("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx" "${SYMBOL}" "${FILES}" "${VARIABLE}" )
+ endmacro()