Sun Nov 1 10:54:06 2020 UTC ()
cmake: patch another instance where should only find pkgsrc selected python
(markd)
diff -r1.177 -r1.178 pkgsrc/devel/cmake/Makefile
diff -r1.166 -r1.167 pkgsrc/devel/cmake/distinfo
diff -r0 -r1.1 pkgsrc/devel/cmake/patches/patch-Modules_FindPython_Support.cmake
--- pkgsrc/devel/cmake/Makefile 2020/06/01 06:21:27 1.177
+++ pkgsrc/devel/cmake/Makefile 2020/11/01 10:54:06 1.178
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.177 2020/06/01 06:21:27 adam Exp $
+# $NetBSD: Makefile,v 1.178 2020/11/01 10:54:06 markd Exp $
+PKGREVISION= 1
.include "Makefile.common"
COMMENT= Cross platform make
@@ -44,7 +45,7 @@
${CP} ${FILESDIR}/Source_Checks_cm_cxx_cbegin.cxx ${WRKSRC}/Source/Checks/cm_cxx_cbegin.cxx
${CP} ${FILESDIR}/Source_Checks_cm_cxx_cend.cxx ${WRKSRC}/Source/Checks/cm_cxx_cend.cxx
${CP} ${FILESDIR}/Source_Checks_cm_cxx_size_t.cxx ${WRKSRC}/Source/Checks/cm_cxx_size_t.cxx
- ${RM} -f ${WRKSRC}/Modules/*.orig ${WRKSRC}/Modules/Compiler/*.orig ${WRKSRC}/Modules/Platform/*.orig
+ ${RM} -f ${WRKSRC}/Modules/*.orig ${WRKSRC}/Modules/Compiler/*.orig ${WRKSRC}/Modules/Platform/*.orig ${WRKSRC}/Modules/FindPython/*.orig
${LN} -f ${WRKSRC}/Modules/Platform/OpenBSD.cmake ${WRKSRC}/Modules/Platform/MirBSD.cmake
.for lang in C CXX Fortran
${LN} -f ${WRKSRC}/Modules/Platform/SunOS-GNU-${lang}.cmake \
--- pkgsrc/devel/cmake/distinfo 2020/10/08 10:57:46 1.166
+++ pkgsrc/devel/cmake/distinfo 2020/11/01 10:54:06 1.167
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.166 2020/10/08 10:57:46 adam Exp $
+$NetBSD: distinfo,v 1.167 2020/11/01 10:54:06 markd Exp $
SHA1 (cmake-3.18.4.tar.gz) = 73ab5348c881f1a53c250b66848b6ee101c9fe1f
RMD160 (cmake-3.18.4.tar.gz) = 1515424e50f418ad80c395c98a45ac3a7229b878
@@ -10,6 +10,7 @@
SHA1 (patch-Modules_FindGTK2.cmake) = 51b7520d35fdec2a7bfcf494fe35ce0e3863e4ee
SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
SHA1 (patch-Modules_FindPythonLibs.cmake) = b5cedc6a2354beaf08e06d416c150154a7dc1f05
+SHA1 (patch-Modules_FindPython_Support.cmake) = df41583388a6dd3654e682cc4317b48433d9d552
SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c
SHA1 (patch-Modules_Platform_Darwin.cmake) = 11116f5b1d1e68a1ce9f76c854d3078e8e233b7a
SHA1 (patch-Modules_Platform_UnixPaths.cmake) = 911271546d3ac52be0e8000857bdb236ac50ec1c
$NetBSD: patch-Modules_FindPython_Support.cmake,v 1.1 2020/11/01 10:54:06 markd Exp $
Insist on select python version for pkgsrc.
--- Modules/FindPython/Support.cmake.orig 2020-10-06 12:28:17.000000000 +0000
+++ Modules/FindPython/Support.cmake
@@ -21,7 +21,9 @@ endif()
if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
message (FATAL_ERROR "FindPython: INTERNAL ERROR")
endif()
-if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "3")
+if (DEFINED PYVERSSUFFIX)
+ set(_${_PYTHON_PREFIX}_VERSIONS ${PYVERSSUFFIX})
+elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "3")
set(_${_PYTHON_PREFIX}_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "2")
set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)