Fri Mar 31 08:06:46 2023 UTC ()
cmake: updated to 3.26.2

CMake 3.26.2
* cmGlobalGenerator: Factor out helper to check target ordering
* Ninja,Makefile: Restore Fortran module scanning in static library cycle
* Ninja: Restore slash style for MinGW tools when extra languages are enabled
* Swift: Restore compatibility with old C++ driver


(adam)
diff -r1.202 -r1.203 pkgsrc/devel/cmake/Makefile
diff -r1.208 -r1.209 pkgsrc/devel/cmake/distinfo
diff -r1.36 -r1.37 pkgsrc/devel/cmake/version.mk
cvs diff -r1.202 -r1.203 pkgsrc/devel/cmake/Makefile (switch to unified diff)

--- pkgsrc/devel/cmake/Makefile 2022/11/22 19:14:02 1.202
+++ pkgsrc/devel/cmake/Makefile 2023/03/31 08:06:46 1.203
@@ -1,87 +1,87 @@ @@ -1,87 +1,87 @@
1# $NetBSD: Makefile,v 1.202 2022/11/22 19:14:02 adam Exp $ 1# $NetBSD: Makefile,v 1.203 2023/03/31 08:06:46 adam Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5COMMENT= Cross platform make 5COMMENT= Cross platform make
6 6
7USE_TOOLS+= gmake 7USE_TOOLS+= gmake
8GCC_REQD+= 4.8 8GCC_REQD+= 4.8
9HAS_CONFIGURE= yes 9HAS_CONFIGURE= yes
10CONFIGURE_SCRIPT= bootstrap 10CONFIGURE_SCRIPT= bootstrap
11 11
12BUILD_TARGET= default_target 12BUILD_TARGET= default_target
13 13
14CONFIGURE_HAS_MANDIR= no 14CONFIGURE_HAS_MANDIR= no
15CONFIGURE_ARGS+= --bootstrap-system-libuv 15CONFIGURE_ARGS+= --bootstrap-system-libuv
16CONFIGURE_ARGS+= --bootstrap-system-librhash 16CONFIGURE_ARGS+= --bootstrap-system-librhash
17CONFIGURE_ARGS+= --mandir=/${PKGMANDIR} 17CONFIGURE_ARGS+= --mandir=/${PKGMANDIR}
18CONFIGURE_ARGS+= --docdir=/share/doc/cmake-${CMAKE_API} 18CONFIGURE_ARGS+= --docdir=/share/doc/cmake-${CMAKE_API}
19CONFIGURE_ARGS+= --parallel=${MAKE_JOBS:U1} 19CONFIGURE_ARGS+= --parallel=${MAKE_JOBS:U1}
20CONFIGURE_ARGS+= --prefix=${PREFIX} 20CONFIGURE_ARGS+= --prefix=${PREFIX}
21CONFIGURE_ARGS+= --system-libs 21CONFIGURE_ARGS+= --system-libs
22# jsoncpp requires cmake to build, so use the one provided with cmake 22# jsoncpp requires cmake to build, so use the one provided with cmake
23CONFIGURE_ARGS+= --no-system-jsoncpp 23CONFIGURE_ARGS+= --no-system-jsoncpp
24 24
25LDFLAGS.Darwin+= -framework CoreServices # for LSOpenCFURLRef() 25LDFLAGS.Darwin+= -framework CoreServices # for LSOpenCFURLRef()
26LDFLAGS.SunOS+= -lsocket -lnsl 26LDFLAGS.SunOS+= -lsocket -lnsl
27 27
28.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
29 29
30.if ${INSTALL_UNSTRIPPED:Uno:tl} != yes 30.if ${INSTALL_UNSTRIPPED:Uno:tl} != yes
31INSTALL_TARGET= install/strip 31INSTALL_TARGET= install/strip
32.endif 32.endif
33 33
34# Enforce arm64 to support building inside x86_64 chroots. 34# Enforce arm64 to support building inside x86_64 chroots.
35.if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64) 35.if ${MACHINE_PLATFORM:MDarwin-*-aarch64}
36CONFIGURE_ENV+= CMAKE_OSX_ARCHITECTURES=arm64 36CONFIGURE_ENV+= CMAKE_OSX_ARCHITECTURES=arm64
37.endif 37.endif
38 38
39PLIST_SUBST+= CMAKE_API=${CMAKE_API} 39PLIST_SUBST+= CMAKE_API=${CMAKE_API}
40 40
41REPLACE_SH= Modules/Compiler/XL-Fortran/cpp 41REPLACE_SH= Modules/Compiler/XL-Fortran/cpp
42 42
43# for Source/cmDependsJavaParser.cxx 43# for Source/cmDependsJavaParser.cxx
44UNLIMIT_RESOURCES= datasize 44UNLIMIT_RESOURCES= datasize
45 45
46# as of 2.4.6, x11 and fortran tests fail in pkgsrc 46# as of 2.4.6, x11 and fortran tests fail in pkgsrc
47TEST_TARGET= test 47TEST_TARGET= test
48 48
49SUBST_CLASSES+= cmake 49SUBST_CLASSES+= cmake
50SUBST_STAGE.cmake= pre-configure 50SUBST_STAGE.cmake= pre-configure
51SUBST_MESSAGE.cmake= Fixing LOCALBASE and X11 paths. 51SUBST_MESSAGE.cmake= Fixing LOCALBASE and X11 paths.
52SUBST_FILES.cmake+= Modules/FindX11.cmake 52SUBST_FILES.cmake+= Modules/FindX11.cmake
53SUBST_FILES.cmake+= Modules/Platform/UnixPaths.cmake 53SUBST_FILES.cmake+= Modules/Platform/UnixPaths.cmake
54SUBST_VARS.cmake= LOCALBASE X11BASE 54SUBST_VARS.cmake= LOCALBASE X11BASE
55 55
56pre-configure: 56pre-configure:
57 ${CP} ${FILESDIR}/Source_Checks_cm_cxx_cbegin.cxx ${WRKSRC}/Source/Checks/cm_cxx_cbegin.cxx 57 ${CP} ${FILESDIR}/Source_Checks_cm_cxx_cbegin.cxx ${WRKSRC}/Source/Checks/cm_cxx_cbegin.cxx
58 ${CP} ${FILESDIR}/Source_Checks_cm_cxx_cend.cxx ${WRKSRC}/Source/Checks/cm_cxx_cend.cxx 58 ${CP} ${FILESDIR}/Source_Checks_cm_cxx_cend.cxx ${WRKSRC}/Source/Checks/cm_cxx_cend.cxx
59 ${CP} ${FILESDIR}/Source_Checks_cm_cxx_size_t.cxx ${WRKSRC}/Source/Checks/cm_cxx_size_t.cxx 59 ${CP} ${FILESDIR}/Source_Checks_cm_cxx_size_t.cxx ${WRKSRC}/Source/Checks/cm_cxx_size_t.cxx
60 ${RM} -f ${WRKSRC}/Modules/*.orig ${WRKSRC}/Modules/Compiler/*.orig ${WRKSRC}/Modules/Platform/*.orig ${WRKSRC}/Modules/FindPython/*.orig 60 ${RM} -f ${WRKSRC}/Modules/*.orig ${WRKSRC}/Modules/Compiler/*.orig ${WRKSRC}/Modules/Platform/*.orig ${WRKSRC}/Modules/FindPython/*.orig
61 ${LN} -f ${WRKSRC}/Modules/Platform/OpenBSD.cmake ${WRKSRC}/Modules/Platform/MirBSD.cmake 61 ${LN} -f ${WRKSRC}/Modules/Platform/OpenBSD.cmake ${WRKSRC}/Modules/Platform/MirBSD.cmake
62.for lang in C CXX Fortran 62.for lang in C CXX Fortran
63 ${LN} -f ${WRKSRC}/Modules/Platform/SunOS-GNU-${lang}.cmake \ 63 ${LN} -f ${WRKSRC}/Modules/Platform/SunOS-GNU-${lang}.cmake \
64 ${WRKSRC}/Modules/Platform/SunOS-Clang-${lang}.cmake 64 ${WRKSRC}/Modules/Platform/SunOS-Clang-${lang}.cmake
65.endfor 65.endfor
66 66
67USE_CURSES= wsyncup 67USE_CURSES= wsyncup
68 68
69BUILDLINK_API_DEPENDS.libarchive+= libarchive>=3.3.3 69BUILDLINK_API_DEPENDS.libarchive+= libarchive>=3.3.3
70BUILDLINK_API_DEPENDS.rhash+= rhash>=1.4.2nb1 70BUILDLINK_API_DEPENDS.rhash+= rhash>=1.4.2nb1
71.include "../../archivers/libarchive/buildlink3.mk" 71.include "../../archivers/libarchive/buildlink3.mk"
72.include "../../archivers/zstd/buildlink3.mk" 72.include "../../archivers/zstd/buildlink3.mk"
73.include "../../devel/libexecinfo/buildlink3.mk" 73.include "../../devel/libexecinfo/buildlink3.mk"
74.include "../../devel/libuv/buildlink3.mk" 74.include "../../devel/libuv/buildlink3.mk"
75.include "../../misc/rhash/buildlink3.mk" 75.include "../../misc/rhash/buildlink3.mk"
76.include "../../textproc/expat/buildlink3.mk" 76.include "../../textproc/expat/buildlink3.mk"
77.include "../../www/curl/buildlink3.mk" 77.include "../../www/curl/buildlink3.mk"
78.include "../../mk/curses.buildlink3.mk" 78.include "../../mk/curses.buildlink3.mk"
79 79
80.if !exists(${BUILDLINK_INCDIRS.curses}/form.h) && \ 80.if !exists(${BUILDLINK_INCDIRS.curses}/form.h) && \
81 exists(${BUILDLINK_INCDIRS.curses}/ncurses/form.h) 81 exists(${BUILDLINK_INCDIRS.curses}/ncurses/form.h)
82CFLAGS+= -I${BUILDLINK_INCDIRS.curses}/ncurses 82CFLAGS+= -I${BUILDLINK_INCDIRS.curses}/ncurses
83CXXFLAGS+= -I${BUILDLINK_INCDIRS.curses}/ncurses 83CXXFLAGS+= -I${BUILDLINK_INCDIRS.curses}/ncurses
84.endif 84.endif
85 85
86.include "../../mk/pthread.buildlink3.mk" 86.include "../../mk/pthread.buildlink3.mk"
87.include "../../mk/bsd.pkg.mk" 87.include "../../mk/bsd.pkg.mk"
cvs diff -r1.208 -r1.209 pkgsrc/devel/cmake/distinfo (switch to unified diff)

--- pkgsrc/devel/cmake/distinfo 2023/03/28 13:30:41 1.208
+++ pkgsrc/devel/cmake/distinfo 2023/03/31 08:06:46 1.209
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: distinfo,v 1.208 2023/03/28 13:30:41 adam Exp $ 1$NetBSD: distinfo,v 1.209 2023/03/31 08:06:46 adam Exp $
2 2
3BLAKE2s (cmake-3.26.1.tar.gz) = 41ad3f3ec6385e3cb70324c03cd0fbf63f044a3913b2f960c38a2cee24acfcd2 3BLAKE2s (cmake-3.26.2.tar.gz) = 0de594ac8b6049ed8bf95711afce7dfee15df1fa374300e8cb7012a2d5b7cb19
4SHA512 (cmake-3.26.1.tar.gz) = e631e4f2277a640015a3c3a2690f0ff68577c4d04d2c39bda0b04afc142df4514b7a813c34e3f245c229ee0d6dcaf667a0f6fd8d76785ea2ff61f5295ae85ada 4SHA512 (cmake-3.26.2.tar.gz) = 7f4eefbffce2bad241261583b0b8962519dc266fa0c6c5ea6917a785eb2b81ebeda637ed9035965a43e9f89f072bc509d4583b5d595a7b72f5e54bb5170f7c9c
5Size (cmake-3.26.1.tar.gz) = 10667838 bytes 5Size (cmake-3.26.2.tar.gz) = 10669169 bytes
6SHA1 (patch-Auxiliary_CMakeLists.txt) = 7a26ef79be53b9d0370029e83f203440aa0be2a4 6SHA1 (patch-Auxiliary_CMakeLists.txt) = 7a26ef79be53b9d0370029e83f203440aa0be2a4
7SHA1 (patch-CMakeLists.txt) = 0fb79458828a021a96e350bc4cf12875914f868b 7SHA1 (patch-CMakeLists.txt) = 0fb79458828a021a96e350bc4cf12875914f868b
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_FindOpenGL.cmake) = 365d422b50a1b1279cab04a8fd11e05633f52833 11SHA1 (patch-Modules_FindOpenGL.cmake) = 365d422b50a1b1279cab04a8fd11e05633f52833
12SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f 12SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
13SHA1 (patch-Modules_FindPythonLibs.cmake) = b5cedc6a2354beaf08e06d416c150154a7dc1f05 13SHA1 (patch-Modules_FindPythonLibs.cmake) = b5cedc6a2354beaf08e06d416c150154a7dc1f05
14SHA1 (patch-Modules_FindPython_Support.cmake) = aaec7767cad795dd269c851bd110ccefbfc87eb3 14SHA1 (patch-Modules_FindPython_Support.cmake) = aaec7767cad795dd269c851bd110ccefbfc87eb3
15SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c 15SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c
16SHA1 (patch-Modules_Platform_Darwin.cmake) = 7629f034111ff64b144ff41316299d5edcfe081a 16SHA1 (patch-Modules_Platform_Darwin.cmake) = 7629f034111ff64b144ff41316299d5edcfe081a
17SHA1 (patch-Modules_Platform_UnixPaths.cmake) = 911271546d3ac52be0e8000857bdb236ac50ec1c 17SHA1 (patch-Modules_Platform_UnixPaths.cmake) = 911271546d3ac52be0e8000857bdb236ac50ec1c
18SHA1 (patch-Source_Checks_Curses_CMakeLists.txt) = 88b6eb834ce7f186f2ebf63a5c40355d0ace9cd9 18SHA1 (patch-Source_Checks_Curses_CMakeLists.txt) = 88b6eb834ce7f186f2ebf63a5c40355d0ace9cd9
19SHA1 (patch-Source_Checks_Curses_CheckCurses.c) = c86cae48f7b39fb735eba4788d4e9d595b2ccf3b 19SHA1 (patch-Source_Checks_Curses_CheckCurses.c) = c86cae48f7b39fb735eba4788d4e9d595b2ccf3b
20SHA1 (patch-Source_Checks_cm__cxx17__check.cpp) = d5e2708df6fcda078b1b5ea59264c663d2633ced 20SHA1 (patch-Source_Checks_cm__cxx17__check.cpp) = d5e2708df6fcda078b1b5ea59264c663d2633ced
21SHA1 (patch-Source_Modules_CMakeBuildUtilities.cmake) = 7046fb8a0d2aadb81e027d8e2f1a4bccf2bd79cf 21SHA1 (patch-Source_Modules_CMakeBuildUtilities.cmake) = 7046fb8a0d2aadb81e027d8e2f1a4bccf2bd79cf
22SHA1 (patch-Source_QtDialog_CMakeLists.txt) = 1cefaa7ee6cd09e84d699ea54844ae3811d890f7 22SHA1 (patch-Source_QtDialog_CMakeLists.txt) = 1cefaa7ee6cd09e84d699ea54844ae3811d890f7
23SHA1 (patch-Source_cmSystemTools.cxx) = 31d736e21ce7f03192cf029a8b6419caa6f00a65 23SHA1 (patch-Source_cmSystemTools.cxx) = 31d736e21ce7f03192cf029a8b6419caa6f00a65
24SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796 24SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
25SHA1 (patch-bootstrap) = e34f5b888790e766338086b8c3680be79b71ef18 25SHA1 (patch-bootstrap) = e34f5b888790e766338086b8c3680be79b71ef18
cvs diff -r1.36 -r1.37 pkgsrc/devel/cmake/version.mk (switch to unified diff)

--- pkgsrc/devel/cmake/version.mk 2023/03/28 13:30:41 1.36
+++ pkgsrc/devel/cmake/version.mk 2023/03/31 08:06:46 1.37
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1# $NetBSD: version.mk,v 1.36 2023/03/28 13:30:41 adam Exp $ 1# $NetBSD: version.mk,v 1.37 2023/03/31 08:06:46 adam Exp $
2# used by devel/cmake/Makefile.common 2# used by devel/cmake/Makefile.common
3# used by devel/cmake-fedora/Makefile 3# used by devel/cmake-fedora/Makefile
4 4
5CMAKE_VERSION= 3.26.1 5CMAKE_VERSION= 3.26.2
6CMAKE_API= ${CMAKE_VERSION:R} 6CMAKE_API= ${CMAKE_VERSION:R}