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++ driverdiff -r1.202 -r1.203 pkgsrc/devel/cmake/Makefile
(adam)
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
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 | |||
5 | COMMENT= Cross platform make | 5 | COMMENT= Cross platform make | |
6 | 6 | |||
7 | USE_TOOLS+= gmake | 7 | USE_TOOLS+= gmake | |
8 | GCC_REQD+= 4.8 | 8 | GCC_REQD+= 4.8 | |
9 | HAS_CONFIGURE= yes | 9 | HAS_CONFIGURE= yes | |
10 | CONFIGURE_SCRIPT= bootstrap | 10 | CONFIGURE_SCRIPT= bootstrap | |
11 | 11 | |||
12 | BUILD_TARGET= default_target | 12 | BUILD_TARGET= default_target | |
13 | 13 | |||
14 | CONFIGURE_HAS_MANDIR= no | 14 | CONFIGURE_HAS_MANDIR= no | |
@@ -22,27 +22,27 @@ CONFIGURE_ARGS+= --system-libs | @@ -22,27 +22,27 @@ CONFIGURE_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 | |
23 | CONFIGURE_ARGS+= --no-system-jsoncpp | 23 | CONFIGURE_ARGS+= --no-system-jsoncpp | |
24 | 24 | |||
25 | LDFLAGS.Darwin+= -framework CoreServices # for LSOpenCFURLRef() | 25 | LDFLAGS.Darwin+= -framework CoreServices # for LSOpenCFURLRef() | |
26 | LDFLAGS.SunOS+= -lsocket -lnsl | 26 | LDFLAGS.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 | |
31 | INSTALL_TARGET= install/strip | 31 | INSTALL_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} | |
36 | CONFIGURE_ENV+= CMAKE_OSX_ARCHITECTURES=arm64 | 36 | CONFIGURE_ENV+= CMAKE_OSX_ARCHITECTURES=arm64 | |
37 | .endif | 37 | .endif | |
38 | 38 | |||
39 | PLIST_SUBST+= CMAKE_API=${CMAKE_API} | 39 | PLIST_SUBST+= CMAKE_API=${CMAKE_API} | |
40 | 40 | |||
41 | REPLACE_SH= Modules/Compiler/XL-Fortran/cpp | 41 | REPLACE_SH= Modules/Compiler/XL-Fortran/cpp | |
42 | 42 | |||
43 | # for Source/cmDependsJavaParser.cxx | 43 | # for Source/cmDependsJavaParser.cxx | |
44 | UNLIMIT_RESOURCES= datasize | 44 | UNLIMIT_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 | |
47 | TEST_TARGET= test | 47 | TEST_TARGET= test | |
48 | 48 |
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
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 | |||
3 | BLAKE2s (cmake-3.26.1.tar.gz) = 41ad3f3ec6385e3cb70324c03cd0fbf63f044a3913b2f960c38a2cee24acfcd2 | 3 | BLAKE2s (cmake-3.26.2.tar.gz) = 0de594ac8b6049ed8bf95711afce7dfee15df1fa374300e8cb7012a2d5b7cb19 | |
4 | SHA512 (cmake-3.26.1.tar.gz) = e631e4f2277a640015a3c3a2690f0ff68577c4d04d2c39bda0b04afc142df4514b7a813c34e3f245c229ee0d6dcaf667a0f6fd8d76785ea2ff61f5295ae85ada | 4 | SHA512 (cmake-3.26.2.tar.gz) = 7f4eefbffce2bad241261583b0b8962519dc266fa0c6c5ea6917a785eb2b81ebeda637ed9035965a43e9f89f072bc509d4583b5d595a7b72f5e54bb5170f7c9c | |
5 | Size (cmake-3.26.1.tar.gz) = 10667838 bytes | 5 | Size (cmake-3.26.2.tar.gz) = 10669169 bytes | |
6 | SHA1 (patch-Auxiliary_CMakeLists.txt) = 7a26ef79be53b9d0370029e83f203440aa0be2a4 | 6 | SHA1 (patch-Auxiliary_CMakeLists.txt) = 7a26ef79be53b9d0370029e83f203440aa0be2a4 | |
7 | SHA1 (patch-CMakeLists.txt) = 0fb79458828a021a96e350bc4cf12875914f868b | 7 | SHA1 (patch-CMakeLists.txt) = 0fb79458828a021a96e350bc4cf12875914f868b | |
8 | SHA1 (patch-Modules_Compiler_GNU.cmake) = e091c53ac3f3a6cd811119d3231563df32e76bf9 | 8 | SHA1 (patch-Modules_Compiler_GNU.cmake) = e091c53ac3f3a6cd811119d3231563df32e76bf9 | |
9 | SHA1 (patch-Modules_FindCurses.cmake) = 98cac805a6abafcfb8b61e441b50a1d6aec27ad0 | 9 | SHA1 (patch-Modules_FindCurses.cmake) = 98cac805a6abafcfb8b61e441b50a1d6aec27ad0 | |
10 | SHA1 (patch-Modules_FindGTK2.cmake) = 51b7520d35fdec2a7bfcf494fe35ce0e3863e4ee | 10 | SHA1 (patch-Modules_FindGTK2.cmake) = 51b7520d35fdec2a7bfcf494fe35ce0e3863e4ee | |
11 | SHA1 (patch-Modules_FindOpenGL.cmake) = 365d422b50a1b1279cab04a8fd11e05633f52833 | 11 | SHA1 (patch-Modules_FindOpenGL.cmake) = 365d422b50a1b1279cab04a8fd11e05633f52833 | |
12 | SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f | 12 | SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f | |
13 | SHA1 (patch-Modules_FindPythonLibs.cmake) = b5cedc6a2354beaf08e06d416c150154a7dc1f05 | 13 | SHA1 (patch-Modules_FindPythonLibs.cmake) = b5cedc6a2354beaf08e06d416c150154a7dc1f05 | |
14 | SHA1 (patch-Modules_FindPython_Support.cmake) = aaec7767cad795dd269c851bd110ccefbfc87eb3 | 14 | SHA1 (patch-Modules_FindPython_Support.cmake) = aaec7767cad795dd269c851bd110ccefbfc87eb3 | |
15 | SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c | 15 | SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c | |
16 | SHA1 (patch-Modules_Platform_Darwin.cmake) = 7629f034111ff64b144ff41316299d5edcfe081a | 16 | SHA1 (patch-Modules_Platform_Darwin.cmake) = 7629f034111ff64b144ff41316299d5edcfe081a | |
17 | SHA1 (patch-Modules_Platform_UnixPaths.cmake) = 911271546d3ac52be0e8000857bdb236ac50ec1c | 17 | SHA1 (patch-Modules_Platform_UnixPaths.cmake) = 911271546d3ac52be0e8000857bdb236ac50ec1c | |
18 | SHA1 (patch-Source_Checks_Curses_CMakeLists.txt) = 88b6eb834ce7f186f2ebf63a5c40355d0ace9cd9 | 18 | SHA1 (patch-Source_Checks_Curses_CMakeLists.txt) = 88b6eb834ce7f186f2ebf63a5c40355d0ace9cd9 |
@@ -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 | |||
5 | CMAKE_VERSION= 3.26.1 | 5 | CMAKE_VERSION= 3.26.2 | |
6 | CMAKE_API= ${CMAKE_VERSION:R} | 6 | CMAKE_API= ${CMAKE_VERSION:R} |