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
cvs diff -r1.177 -r1.178 pkgsrc/devel/cmake/Makefile (expand / switch to unified diff)

--- 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,15 +1,16 @@ @@ -1,15 +1,16 @@
1# $NetBSD: Makefile,v 1.177 2020/06/01 06:21:27 adam Exp $ 1# $NetBSD: Makefile,v 1.178 2020/11/01 10:54:06 markd Exp $
2 2
 3PKGREVISION= 1
3.include "Makefile.common" 4.include "Makefile.common"
4 5
5COMMENT= Cross platform make 6COMMENT= Cross platform make
6 7
7USE_TOOLS+= gmake 8USE_TOOLS+= gmake
8GCC_REQD+= 4.8 9GCC_REQD+= 4.8
9HAS_CONFIGURE= yes 10HAS_CONFIGURE= yes
10CONFIGURE_SCRIPT= bootstrap 11CONFIGURE_SCRIPT= bootstrap
11 12
12BUILD_TARGET= default_target 13BUILD_TARGET= default_target
13 14
14CONFIGURE_HAS_MANDIR= no 15CONFIGURE_HAS_MANDIR= no
15CONFIGURE_ARGS+= --mandir=/${PKGMANDIR} 16CONFIGURE_ARGS+= --mandir=/${PKGMANDIR}
@@ -34,27 +35,27 @@ UNLIMIT_RESOURCES= datasize @@ -34,27 +35,27 @@ UNLIMIT_RESOURCES= datasize
34TEST_TARGET= test 35TEST_TARGET= test
35 36
36SUBST_CLASSES+= cmake 37SUBST_CLASSES+= cmake
37SUBST_STAGE.cmake= pre-configure 38SUBST_STAGE.cmake= pre-configure
38SUBST_MESSAGE.cmake= Fixing LOCALBASE and X11 paths. 39SUBST_MESSAGE.cmake= Fixing LOCALBASE and X11 paths.
39SUBST_FILES.cmake+= Modules/FindX11.cmake 40SUBST_FILES.cmake+= Modules/FindX11.cmake
40SUBST_FILES.cmake+= Modules/Platform/UnixPaths.cmake 41SUBST_FILES.cmake+= Modules/Platform/UnixPaths.cmake
41SUBST_VARS.cmake= LOCALBASE X11BASE 42SUBST_VARS.cmake= LOCALBASE X11BASE
42 43
43pre-configure: 44pre-configure:
44 ${CP} ${FILESDIR}/Source_Checks_cm_cxx_cbegin.cxx ${WRKSRC}/Source/Checks/cm_cxx_cbegin.cxx 45 ${CP} ${FILESDIR}/Source_Checks_cm_cxx_cbegin.cxx ${WRKSRC}/Source/Checks/cm_cxx_cbegin.cxx
45 ${CP} ${FILESDIR}/Source_Checks_cm_cxx_cend.cxx ${WRKSRC}/Source/Checks/cm_cxx_cend.cxx 46 ${CP} ${FILESDIR}/Source_Checks_cm_cxx_cend.cxx ${WRKSRC}/Source/Checks/cm_cxx_cend.cxx
46 ${CP} ${FILESDIR}/Source_Checks_cm_cxx_size_t.cxx ${WRKSRC}/Source/Checks/cm_cxx_size_t.cxx 47 ${CP} ${FILESDIR}/Source_Checks_cm_cxx_size_t.cxx ${WRKSRC}/Source/Checks/cm_cxx_size_t.cxx
47 ${RM} -f ${WRKSRC}/Modules/*.orig ${WRKSRC}/Modules/Compiler/*.orig ${WRKSRC}/Modules/Platform/*.orig 48 ${RM} -f ${WRKSRC}/Modules/*.orig ${WRKSRC}/Modules/Compiler/*.orig ${WRKSRC}/Modules/Platform/*.orig ${WRKSRC}/Modules/FindPython/*.orig
48 ${LN} -f ${WRKSRC}/Modules/Platform/OpenBSD.cmake ${WRKSRC}/Modules/Platform/MirBSD.cmake 49 ${LN} -f ${WRKSRC}/Modules/Platform/OpenBSD.cmake ${WRKSRC}/Modules/Platform/MirBSD.cmake
49.for lang in C CXX Fortran 50.for lang in C CXX Fortran
50 ${LN} -f ${WRKSRC}/Modules/Platform/SunOS-GNU-${lang}.cmake \ 51 ${LN} -f ${WRKSRC}/Modules/Platform/SunOS-GNU-${lang}.cmake \
51 ${WRKSRC}/Modules/Platform/SunOS-Clang-${lang}.cmake 52 ${WRKSRC}/Modules/Platform/SunOS-Clang-${lang}.cmake
52.endfor 53.endfor
53 54
54USE_CURSES= wsyncup 55USE_CURSES= wsyncup
55 56
56BUILDLINK_API_DEPENDS.libarchive+= libarchive>=3.3.3 57BUILDLINK_API_DEPENDS.libarchive+= libarchive>=3.3.3
57.include "../../archivers/libarchive/buildlink3.mk" 58.include "../../archivers/libarchive/buildlink3.mk"
58.include "../../devel/libexecinfo/buildlink3.mk" 59.include "../../devel/libexecinfo/buildlink3.mk"
59.include "../../devel/libuv/buildlink3.mk" 60.include "../../devel/libuv/buildlink3.mk"
60.include "../../misc/rhash/buildlink3.mk" 61.include "../../misc/rhash/buildlink3.mk"
cvs diff -r1.166 -r1.167 pkgsrc/devel/cmake/distinfo (expand / switch to unified diff)

--- 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,24 +1,25 @@ @@ -1,24 +1,25 @@
1$NetBSD: distinfo,v 1.166 2020/10/08 10:57:46 adam Exp $ 1$NetBSD: distinfo,v 1.167 2020/11/01 10:54:06 markd Exp $
2 2
3SHA1 (cmake-3.18.4.tar.gz) = 73ab5348c881f1a53c250b66848b6ee101c9fe1f 3SHA1 (cmake-3.18.4.tar.gz) = 73ab5348c881f1a53c250b66848b6ee101c9fe1f
4RMD160 (cmake-3.18.4.tar.gz) = 1515424e50f418ad80c395c98a45ac3a7229b878 4RMD160 (cmake-3.18.4.tar.gz) = 1515424e50f418ad80c395c98a45ac3a7229b878
5SHA512 (cmake-3.18.4.tar.gz) = 2f0c5647ed58bf911d0bfeafc7f22a3de09aa3be86301158fa51c8560e994534d7500869067432ecf91e82213a0b36ddb5db11c5c55d2ca5e5647ac9f75717b9 5SHA512 (cmake-3.18.4.tar.gz) = 2f0c5647ed58bf911d0bfeafc7f22a3de09aa3be86301158fa51c8560e994534d7500869067432ecf91e82213a0b36ddb5db11c5c55d2ca5e5647ac9f75717b9
6Size (cmake-3.18.4.tar.gz) = 8976659 bytes 6Size (cmake-3.18.4.tar.gz) = 8976659 bytes
7SHA1 (patch-CMakeLists.txt) = fabdb0590f4b97c34c2242749ae3b6af18aefc0a 7SHA1 (patch-CMakeLists.txt) = fabdb0590f4b97c34c2242749ae3b6af18aefc0a
8SHA1 (patch-Modules_Compiler_GNU.cmake) = e091c53ac3f3a6cd811119d3231563df32e76bf9 8SHA1 (patch-Modules_Compiler_GNU.cmake) = e091c53ac3f3a6cd811119d3231563df32e76bf9
9SHA1 (patch-Modules_FindCurses.cmake) = 98cac805a6abafcfb8b61e441b50a1d6aec27ad0 9SHA1 (patch-Modules_FindCurses.cmake) = 98cac805a6abafcfb8b61e441b50a1d6aec27ad0
10SHA1 (patch-Modules_FindGTK2.cmake) = 51b7520d35fdec2a7bfcf494fe35ce0e3863e4ee 10SHA1 (patch-Modules_FindGTK2.cmake) = 51b7520d35fdec2a7bfcf494fe35ce0e3863e4ee
11SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f 11SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
12SHA1 (patch-Modules_FindPythonLibs.cmake) = b5cedc6a2354beaf08e06d416c150154a7dc1f05 12SHA1 (patch-Modules_FindPythonLibs.cmake) = b5cedc6a2354beaf08e06d416c150154a7dc1f05
 13SHA1 (patch-Modules_FindPython_Support.cmake) = df41583388a6dd3654e682cc4317b48433d9d552
13SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c 14SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c
14SHA1 (patch-Modules_Platform_Darwin.cmake) = 11116f5b1d1e68a1ce9f76c854d3078e8e233b7a 15SHA1 (patch-Modules_Platform_Darwin.cmake) = 11116f5b1d1e68a1ce9f76c854d3078e8e233b7a
15SHA1 (patch-Modules_Platform_UnixPaths.cmake) = 911271546d3ac52be0e8000857bdb236ac50ec1c 16SHA1 (patch-Modules_Platform_UnixPaths.cmake) = 911271546d3ac52be0e8000857bdb236ac50ec1c
16SHA1 (patch-Source_CMakeLists.txt) = 533667d43048b8bc2be17a766b5dc32f3101866e 17SHA1 (patch-Source_CMakeLists.txt) = 533667d43048b8bc2be17a766b5dc32f3101866e
17SHA1 (patch-Source_Checks_Curses_CMakeLists.txt) = 37d95c6162cc1f4c0e47b537ac8204cb9fe75b8c 18SHA1 (patch-Source_Checks_Curses_CMakeLists.txt) = 37d95c6162cc1f4c0e47b537ac8204cb9fe75b8c
18SHA1 (patch-Source_Checks_Curses_CheckCurses.c) = c86cae48f7b39fb735eba4788d4e9d595b2ccf3b 19SHA1 (patch-Source_Checks_Curses_CheckCurses.c) = c86cae48f7b39fb735eba4788d4e9d595b2ccf3b
19SHA1 (patch-Source_Checks_cm__cxx17__check.cpp) = d5e2708df6fcda078b1b5ea59264c663d2633ced 20SHA1 (patch-Source_Checks_cm__cxx17__check.cpp) = d5e2708df6fcda078b1b5ea59264c663d2633ced
20SHA1 (patch-Source_CursesDialog_ccmake.cxx) = 7f6ca6fda5d0db615f04c18efa8ecdd6ef00cb93 21SHA1 (patch-Source_CursesDialog_ccmake.cxx) = 7f6ca6fda5d0db615f04c18efa8ecdd6ef00cb93
21SHA1 (patch-Source_QtDialog_CMakeLists.txt) = c4007da363c5b7c925f1ff345901057f3fbdc4e1 22SHA1 (patch-Source_QtDialog_CMakeLists.txt) = c4007da363c5b7c925f1ff345901057f3fbdc4e1
22SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796 23SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
23SHA1 (patch-Utilities_std_cm_string__view) = 90bbb578c5628b661a25974d7dd9aa6f5063271f 24SHA1 (patch-Utilities_std_cm_string__view) = 90bbb578c5628b661a25974d7dd9aa6f5063271f
24SHA1 (patch-bootstrap) = fc1b689bbe705cd888e2bef4debad1a26e5885bd 25SHA1 (patch-bootstrap) = fc1b689bbe705cd888e2bef4debad1a26e5885bd
File Added: pkgsrc/devel/cmake/patches/patch-Modules_FindPython_Support.cmake
$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)