Attachment 241151 Details for Bug 270491 – patch, apply with git am

[patch] patch, apply with git am

cmake-3.26.1-update.patch (text/plain), 16.46 KB, created by Adriaan de Groot on 2023-03-27 21:52:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adriaan de Groot

Created: 2023-03-27 21:52:42 UTC

Size: 16.46 KB

patch

obsolete

>From c0ea216fd15dd588d4a1878f82b8ea930e9dc014 Mon Sep 17 00:00:00 2001
>From: Adriaan de Groot <adridg@FreeBSD.org>
>Date: Thu, 16 Mar 2023 22:21:10 +0100
>Subject: [PATCH 1/7] devel/cmake: update to 3.26.1, latest upstream
>
>See release notes at
>	https://cmake.org/cmake/help/v3.26/release/3.26.html
>---
> Mk/Uses/cmake.mk                   |  2 +-
> devel/cmake-core/distinfo          |  6 +++---
> devel/cmake-core/pkg-plist         | 21 +++++++++++++++++++++
> devel/cmake-man/pkg-plist          |  1 +
> devel/cmake-modules-webos/distinfo |  1 +
> 5 files changed, 27 insertions(+), 4 deletions(-)
>
>diff --git Mk/Uses/cmake.mk Mk/Uses/cmake.mk
>index d2063468fea0..784e67bfaf50 100644
>--- Mk/Uses/cmake.mk
>+++ Mk/Uses/cmake.mk
>@@ -50,7 +50,7 @@ _INCLUDE_USES_CMAKE_MK=	yes
> 
> _valid_ARGS=		insource run noninja testing _internal
> 
>-_CMAKE_VERSION=		3.25.1
>+_CMAKE_VERSION=		3.26.1
> 
> # Sanity check
> .  for arg in ${cmake_ARGS}
>diff --git devel/cmake-core/distinfo devel/cmake-core/distinfo
>index 31e39a49030c..a49c428c1fcd 100644
>--- devel/cmake-core/distinfo
>+++ devel/cmake-core/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1672089061
>-SHA256 (cmake-3.25.1.tar.gz) = 1c511d09516af493694ed9baf13c55947a36389674d657a2d5e0ccedc6b291d8
>-SIZE (cmake-3.25.1.tar.gz) = 10561054
>+TIMESTAMP = 1679872416
>+SHA256 (cmake-3.26.1.tar.gz) = f29964290ad3ced782a1e58ca9fda394a82406a647e24d6afd4e6c32e42c412f
>+SIZE (cmake-3.26.1.tar.gz) = 10667838
>diff --git devel/cmake-core/pkg-plist devel/cmake-core/pkg-plist
>index 5834a007fb34..6803fa47fef9 100644
>--- devel/cmake-core/pkg-plist
>+++ devel/cmake-core/pkg-plist
>@@ -7,8 +7,10 @@ bin/ctest
> %%DATADIR%%/Help/command/FIND_XXX_ORDER.txt
> %%DATADIR%%/Help/command/FIND_XXX_REGISTRY_VIEW.txt
> %%DATADIR%%/Help/command/FIND_XXX_ROOT.txt
>+%%DATADIR%%/Help/command/GENEX_NOTE.txt
> %%DATADIR%%/Help/command/LINK_OPTIONS_LINKER.txt
> %%DATADIR%%/Help/command/OPTIONS_SHELL.txt
>+%%DATADIR%%/Help/command/SUPPORTED_LANGUAGES.txt
> %%DATADIR%%/Help/command/add_compile_definitions.rst
> %%DATADIR%%/Help/command/add_compile_options.rst
> %%DATADIR%%/Help/command/add_custom_command.rst
>@@ -177,6 +179,7 @@ bin/ctest
> %%DATADIR%%/Help/envvar/CMAKE_TOOLCHAIN_FILE.rst
> %%DATADIR%%/Help/envvar/CSFLAGS.rst
> %%DATADIR%%/Help/envvar/CTEST_INTERACTIVE_DEBUG_MODE.rst
>+%%DATADIR%%/Help/envvar/CTEST_NO_TESTS_ACTION.rst
> %%DATADIR%%/Help/envvar/CTEST_OUTPUT_ON_FAILURE.rst
> %%DATADIR%%/Help/envvar/CTEST_PARALLEL_LEVEL.rst
> %%DATADIR%%/Help/envvar/CTEST_PROGRESS_OUTPUT.rst
>@@ -250,6 +253,7 @@ bin/ctest
> %%DATADIR%%/Help/manual/cmake-buildsystem.7.rst
> %%DATADIR%%/Help/manual/cmake-commands.7.rst
> %%DATADIR%%/Help/manual/cmake-compile-features.7.rst
>+%%DATADIR%%/Help/manual/cmake-configure-log.7.rst
> %%DATADIR%%/Help/manual/cmake-developer.7.rst
> %%DATADIR%%/Help/manual/cmake-env-variables.7.rst
> %%DATADIR%%/Help/manual/cmake-file-api.7.rst
>@@ -683,6 +687,7 @@ bin/ctest
> %%DATADIR%%/Help/policy/CMP0140.rst
> %%DATADIR%%/Help/policy/CMP0141.rst
> %%DATADIR%%/Help/policy/CMP0142.rst
>+%%DATADIR%%/Help/policy/CMP0143.rst
> %%DATADIR%%/Help/policy/DEPRECATED.txt
> %%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt
> %%DATADIR%%/Help/prop_cache/ADVANCED.rst
>@@ -781,6 +786,7 @@ bin/ctest
> %%DATADIR%%/Help/prop_sf/COMPILE_DEFINITIONS_CONFIG.rst
> %%DATADIR%%/Help/prop_sf/COMPILE_FLAGS.rst
> %%DATADIR%%/Help/prop_sf/COMPILE_OPTIONS.rst
>+%%DATADIR%%/Help/prop_sf/CXX_SCAN_FOR_MODULES.rst
> %%DATADIR%%/Help/prop_sf/EXTERNAL_OBJECT.rst
> %%DATADIR%%/Help/prop_sf/Fortran_FORMAT.rst
> %%DATADIR%%/Help/prop_sf/Fortran_PREPROCESS.rst
>@@ -941,6 +947,7 @@ bin/ctest
> %%DATADIR%%/Help/prop_tgt/CXX_MODULE_SET.rst
> %%DATADIR%%/Help/prop_tgt/CXX_MODULE_SETS.rst
> %%DATADIR%%/Help/prop_tgt/CXX_MODULE_SET_NAME.rst
>+%%DATADIR%%/Help/prop_tgt/CXX_SCAN_FOR_MODULES.rst
> %%DATADIR%%/Help/prop_tgt/CXX_STANDARD.rst
> %%DATADIR%%/Help/prop_tgt/CXX_STANDARD_REQUIRED.rst
> %%DATADIR%%/Help/prop_tgt/C_EXTENSIONS.rst
>@@ -1051,6 +1058,7 @@ bin/ctest
> %%DATADIR%%/Help/prop_tgt/JOB_POOL_PRECOMPILE_HEADER.rst
> %%DATADIR%%/Help/prop_tgt/LABELS.rst
> %%DATADIR%%/Help/prop_tgt/LANG_CLANG_TIDY.rst
>+%%DATADIR%%/Help/prop_tgt/LANG_CLANG_TIDY_EXPORT_FIXES_DIR.rst
> %%DATADIR%%/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst
> %%DATADIR%%/Help/prop_tgt/LANG_CPPCHECK.rst
> %%DATADIR%%/Help/prop_tgt/LANG_CPPLINT.rst
>@@ -1262,6 +1270,7 @@ bin/ctest
> %%DATADIR%%/Help/release/3.23.rst
> %%DATADIR%%/Help/release/3.24.rst
> %%DATADIR%%/Help/release/3.25.rst
>+%%DATADIR%%/Help/release/3.26.rst
> %%DATADIR%%/Help/release/3.3.rst
> %%DATADIR%%/Help/release/3.4.rst
> %%DATADIR%%/Help/release/3.5.rst
>@@ -1387,6 +1396,7 @@ bin/ctest
> %%DATADIR%%/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst
> %%DATADIR%%/Help/variable/CMAKE_CXX_COMPILE_FEATURES.rst
> %%DATADIR%%/Help/variable/CMAKE_CXX_EXTENSIONS.rst
>+%%DATADIR%%/Help/variable/CMAKE_CXX_SCAN_FOR_MODULES.rst
> %%DATADIR%%/Help/variable/CMAKE_CXX_STANDARD.rst
> %%DATADIR%%/Help/variable/CMAKE_CXX_STANDARD_REQUIRED.rst
> %%DATADIR%%/Help/variable/CMAKE_C_COMPILE_FEATURES.rst
>@@ -1530,6 +1540,7 @@ bin/ctest
> %%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_FINISH.rst
> %%DATADIR%%/Help/variable/CMAKE_LANG_BYTE_ORDER.rst
> %%DATADIR%%/Help/variable/CMAKE_LANG_CLANG_TIDY.rst
>+%%DATADIR%%/Help/variable/CMAKE_LANG_CLANG_TIDY_EXPORT_FIXES_DIR.rst
> %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER.rst
> %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_ABI.rst
> %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_AR.rst
>@@ -1783,6 +1794,8 @@ bin/ctest
> %%DATADIR%%/Help/variable/CMAKE_VS_TARGET_FRAMEWORK_IDENTIFIER.rst
> %%DATADIR%%/Help/variable/CMAKE_VS_TARGET_FRAMEWORK_TARGETS_VERSION.rst
> %%DATADIR%%/Help/variable/CMAKE_VS_TARGET_FRAMEWORK_VERSION.rst
>+%%DATADIR%%/Help/variable/CMAKE_VS_VERSION_BUILD_NUMBER.rst
>+%%DATADIR%%/Help/variable/CMAKE_VS_VERSION_BUILD_NUMBER_COMPONENTS.txt
> %%DATADIR%%/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst
> %%DATADIR%%/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM.rst
> %%DATADIR%%/Help/variable/CMAKE_VS_WINRT_BY_DEFAULT.rst
>@@ -1977,6 +1990,7 @@ bin/ctest
> %%DATADIR%%/Modules/CMakeASM-ATTInformation.cmake
> %%DATADIR%%/Modules/CMakeASMCompiler.cmake.in
> %%DATADIR%%/Modules/CMakeASMInformation.cmake
>+%%DATADIR%%/Modules/CMakeASM_MARMASMInformation.cmake
> %%DATADIR%%/Modules/CMakeASM_MASMInformation.cmake
> %%DATADIR%%/Modules/CMakeASM_NASMInformation.cmake
> %%DATADIR%%/Modules/CMakeAddFortranSubdirectory.cmake
>@@ -2010,6 +2024,7 @@ bin/ctest
> %%DATADIR%%/Modules/CMakeDependentOption.cmake
> %%DATADIR%%/Modules/CMakeDetermineASM-ATTCompiler.cmake
> %%DATADIR%%/Modules/CMakeDetermineASMCompiler.cmake
>+%%DATADIR%%/Modules/CMakeDetermineASM_MARMASMCompiler.cmake
> %%DATADIR%%/Modules/CMakeDetermineASM_MASMCompiler.cmake
> %%DATADIR%%/Modules/CMakeDetermineASM_NASMCompiler.cmake
> %%DATADIR%%/Modules/CMakeDetermineCCompiler.cmake
>@@ -2097,6 +2112,7 @@ bin/ctest
> %%DATADIR%%/Modules/CMakeSystemSpecificInitialize.cmake
> %%DATADIR%%/Modules/CMakeTestASM-ATTCompiler.cmake
> %%DATADIR%%/Modules/CMakeTestASMCompiler.cmake
>+%%DATADIR%%/Modules/CMakeTestASM_MARMASMCompiler.cmake
> %%DATADIR%%/Modules/CMakeTestASM_MASMCompiler.cmake
> %%DATADIR%%/Modules/CMakeTestASM_NASMCompiler.cmake
> %%DATADIR%%/Modules/CMakeTestCCompiler.cmake
>@@ -3010,6 +3026,10 @@ bin/ctest
> %%DATADIR%%/Modules/Platform/Windows-df.cmake
> %%DATADIR%%/Modules/Platform/Windows-windres.cmake
> %%DATADIR%%/Modules/Platform/Windows.cmake
>+%%DATADIR%%/Modules/Platform/Windows3x-OpenWatcom-C.cmake
>+%%DATADIR%%/Modules/Platform/Windows3x-OpenWatcom-CXX.cmake
>+%%DATADIR%%/Modules/Platform/Windows3x-OpenWatcom.cmake
>+%%DATADIR%%/Modules/Platform/Windows3x.cmake
> %%DATADIR%%/Modules/Platform/WindowsCE-MSVC-C.cmake
> %%DATADIR%%/Modules/Platform/WindowsCE-MSVC-CXX.cmake
> %%DATADIR%%/Modules/Platform/WindowsCE.cmake
>@@ -3103,6 +3123,7 @@ bin/ctest
> %%DATADIR%%/Templates/MSBuild/FlagTables/v10_CudaHost.json
> %%DATADIR%%/Templates/MSBuild/FlagTables/v10_LIB.json
> %%DATADIR%%/Templates/MSBuild/FlagTables/v10_Link.json
>+%%DATADIR%%/Templates/MSBuild/FlagTables/v10_MARMASM.json
> %%DATADIR%%/Templates/MSBuild/FlagTables/v10_MASM.json
> %%DATADIR%%/Templates/MSBuild/FlagTables/v10_NASM.json
> %%DATADIR%%/Templates/MSBuild/FlagTables/v10_RC.json
>diff --git devel/cmake-man/pkg-plist devel/cmake-man/pkg-plist
>index b6c2bf8ae976..9297f1634711 100644
>--- devel/cmake-man/pkg-plist
>+++ devel/cmake-man/pkg-plist
>@@ -5,6 +5,7 @@ man/man1/ctest.1.gz
> man/man7/cmake-buildsystem.7.gz
> man/man7/cmake-commands.7.gz
> man/man7/cmake-compile-features.7.gz
>+man/man7/cmake-configure-log.7.gz
> man/man7/cmake-developer.7.gz
> man/man7/cmake-env-variables.7.gz
> man/man7/cmake-file-api.7.gz
>diff --git devel/cmake-modules-webos/distinfo devel/cmake-modules-webos/distinfo
>index 03fb77c0d9ba..ad6c97d22484 100644
>--- devel/cmake-modules-webos/distinfo
>+++ devel/cmake-modules-webos/distinfo
>@@ -1,2 +1,3 @@
>+TIMESTAMP = 1678990905
> SHA256 (FreeWebOS-cmake-modules-webos-1.0b-submissions-19_GH0.tar.gz) = 2d4e23eb4c18180e6117cd05cb5447ae6e10882af7298d85ac8d0a6b5dcc8e08
> SIZE (FreeWebOS-cmake-modules-webos-1.0b-submissions-19_GH0.tar.gz) = 30271
>-- 
>2.39.1
>
>From afff74f5bdbb199f91fe8369bab98e68bcdea07e Mon Sep 17 00:00:00 2001
>From: Adriaan de Groot <adridg@FreeBSD.org>
>Date: Mon, 20 Mar 2023 13:14:44 +0100
>Subject: [PATCH 2/7] science/openkim-models: fix in advance of CMake 3.26
>
>Needs to pull in **some** language (so pull in the languages
>that all the models want) to find the size of (void *)
>---
> science/openkim-models/Makefile                |  1 +
> .../openkim-models/files/patch-CMakeLists.txt  | 18 ++++++++++++++++++
> 2 files changed, 19 insertions(+)
> create mode 100644 science/openkim-models/files/patch-CMakeLists.txt
>
>diff --git science/openkim-models/Makefile science/openkim-models/Makefile
>index 3446ec05ee16..35563970d860 100644
>--- science/openkim-models/Makefile
>+++ science/openkim-models/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	openkim-models
> DISTVERSION=	2021-08-11
>+PORTREVISION=	1
> CATEGORIES=	science
> MASTER_SITES=	https://s3.openkim.org/archives/collection/
> 
>diff --git science/openkim-models/files/patch-CMakeLists.txt science/openkim-models/files/patch-CMakeLists.txt
>new file mode 100644
>index 000000000000..5fb51b233d0d
>--- /dev/null
>+++ science/openkim-models/files/patch-CMakeLists.txt
>@@ -0,0 +1,18 @@
>+Need to check **some** language in order to get sizeof(void *),
>+otherwise the calls to find the kim-api package will fail with
>+a message saying that 2.3.0 (64 bit) is unsupported.
>+
>+--- CMakeLists.txt.orig	2023-03-20 12:08:16 UTC
>++++ CMakeLists.txt
>+@@ -25,9 +25,10 @@
>+ 
>+ 
>+ cmake_minimum_required(VERSION 3.10)
>+-project(openkim-models LANGUAGES NONE)
>++project(openkim-models LANGUAGES CXX C Fortran)
>+ enable_testing()
>+ 
>++message(STATUS "VOID_P=${CMAKE_SIZEOF_VOID_P}")
>+ file(GLOB MD "${CMAKE_SOURCE_DIR}/model-drivers/*")
>+ foreach(item ${MD})
>+   add_subdirectory(${item})
>-- 
>2.39.1
>
>From bded5ee4f289f6b64bb61f9e3df9da8836b47755 Mon Sep 17 00:00:00 2001
>From: Adriaan de Groot <adridg@FreeBSD.org>
>Date: Thu, 23 Mar 2023 20:14:00 +0100
>Subject: [PATCH 3/7] net/linphone: need a project() before looking for
> packages
>
>See e.g. https://gitlab.kitware.com/cmake/cmake/-/issues/24333
>---
> net/linphone/files/patch-CMakeLists.txt | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
>diff --git net/linphone/files/patch-CMakeLists.txt net/linphone/files/patch-CMakeLists.txt
>index 1b68c310fbb9..c53dd66eed28 100644
>--- net/linphone/files/patch-CMakeLists.txt
>+++ net/linphone/files/patch-CMakeLists.txt
>@@ -1,5 +1,13 @@
> --- CMakeLists.txt.orig	2022-08-24 10:17:10 UTC
> +++ CMakeLists.txt
>+@@ -20,6 +20,7 @@
>+ #
>+ ################################################################################
>+ cmake_minimum_required(VERSION 3.1)
>++project(linphoneqt)
>+ 
>+ find_package(bctoolbox CONFIG)
>+ set(FULL_VERSION )
> @@ -487,7 +487,7 @@ if(APPLE)
>  		set(MSPLUGINS_DIR "Frameworks/mediastreamer2.framework/Versions/A/Libraries")
>  	endif()
>-- 
>2.39.1
>
>From 3b788440ff67ea99c273df0e7517bb92acd9a5ce Mon Sep 17 00:00:00 2001
>From: Adriaan de Groot <adridg@FreeBSD.org>
>Date: Thu, 23 Mar 2023 21:37:48 +0100
>Subject: [PATCH 4/7] graphics/glvis: repair build with CMake 3.26
>
>Needs to have *some* language enabled to find sizeof(void *) before
>looking for mfem.
>---
> graphics/glvis/files/patch-CMakeLists.txt | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
>diff --git graphics/glvis/files/patch-CMakeLists.txt graphics/glvis/files/patch-CMakeLists.txt
>index 725bede416c6..b0428a6c0c3e 100644
>--- graphics/glvis/files/patch-CMakeLists.txt
>+++ graphics/glvis/files/patch-CMakeLists.txt
>@@ -1,5 +1,14 @@
>---- CMakeLists.txt.orig	2022-08-24 16:49:50 UTC
>+--- CMakeLists.txt.orig	2022-05-24 00:33:38 UTC
> +++ CMakeLists.txt
>+@@ -22,7 +22,7 @@ if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR
>+   message(FATAL_ERROR "In-source builds are prohibited.")
>+ endif ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
>+ 
>+-project(glvis NONE)
>++project(glvis C)
>+ 
>+ # Import MFEM. The following variables can be used to help CMake find MFEM:
>+ #  * MFEM_DIR - absolute path to the MFEM build or install prefix.
> @@ -333,10 +333,12 @@ if(NOT EMSCRIPTEN)
>    install(TARGETS app
>      RUNTIME DESTINATION .
>-- 
>2.39.1
>
>From 950ed8edd4bec119540f1328b18be7c86a73cf73 Mon Sep 17 00:00:00 2001
>From: Adriaan de Groot <adridg@FreeBSD.org>
>Date: Thu, 23 Mar 2023 21:53:25 +0100
>Subject: [PATCH 5/7] devel/msgpack-cxx: repair for C++ consumers via CMake
>
>The pc and cmake-config file names have changed a couple of times,
>so they are not in sync; when confuming via CMake, error
>
>CMake Error at /usr/local/lib/cmake/msgpackc-cxx/msgpackc-cxx-config.cmake:33 (include):
>  include could not find requested file:
>
>    /usr/local/lib/cmake/msgpackc-cxx/msgpack-cxx-targets.cmake
>Call Stack (most recent call first):
>  CMakeLists.txt:62 (find_package)
>
>That is because a "c" was inserted into the filename at some point.
>Use CMake logic to try both names.
>---
> devel/msgpack-cxx/Makefile | 1 +
> 1 file changed, 1 insertion(+)
>
>diff --git devel/msgpack-cxx/Makefile devel/msgpack-cxx/Makefile
>index 6e5994983070..0720be61b97e 100644
>--- devel/msgpack-cxx/Makefile
>+++ devel/msgpack-cxx/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	msgpack
> PORTVERSION=	6.0.0
>+PORTREVISION=	1
> DISTVERSIONPREFIX=	cpp-
> CATEGORIES=	devel
> PKGNAMESUFFIX=	-cxx
>-- 
>2.39.1
>
>From 1457ed4f3c9828a8be191467356e554e9dff6080 Mon Sep 17 00:00:00 2001
>From: Adriaan de Groot <adridg@FreeBSD.org>
>Date: Mon, 27 Mar 2023 23:42:41 +0200
>Subject: [PATCH 6/7] devel/cmake-core: remove obsolete patch
>
>Reported by:	diizzy
>PR:		270337
>---
> .../files/patch-Utilities_cmcurl_lib_url.c          | 13 -------------
> 1 file changed, 13 deletions(-)
> delete mode 100644 devel/cmake-core/files/patch-Utilities_cmcurl_lib_url.c
>
>diff --git devel/cmake-core/files/patch-Utilities_cmcurl_lib_url.c devel/cmake-core/files/patch-Utilities_cmcurl_lib_url.c
>deleted file mode 100644
>index bfb9c287ed71..000000000000
>--- devel/cmake-core/files/patch-Utilities_cmcurl_lib_url.c
>+++ /dev/null
>@@ -1,13 +0,0 @@
>---- Utilities/cmcurl/lib/url.c.orig	2022-08-04 13:53:57 UTC
>-+++ Utilities/cmcurl/lib/url.c
>-@@ -626,6 +626,10 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data)
>-     CURL_HTTP_VERSION_1_1
>- #endif
>-     ;
>-+#if defined(__FreeBSD_version)
>-+  /* different handling of signals and threads */
>-+  set->no_signal = TRUE;
>-+#endif
>-   Curl_http2_init_userset(set);
>-   return result;
>- }
>-- 
>2.39.1
>
>From 6eeecf8497ef6f089a216b9eea396d9ca329d516 Mon Sep 17 00:00:00 2001
>From: Adriaan de Groot <adridg@FreeBSD.org>
>Date: Mon, 27 Mar 2023 23:44:29 +0200
>Subject: [PATCH 7/7] devel/cmake-core: set LOCALSTATEDIR to /var
>
>Generally, FreeBSD has a /var and no $LOCALBASE/var, so
>make CMake things that want to install to LOCALSTATEDIR
>(the CMake / GNU Install name for /var) use the real one.
>
>PR:		267748
>---
> .../files/patch-Modules_GNUInstallDirs.cmake      | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
> create mode 100644 devel/cmake-core/files/patch-Modules_GNUInstallDirs.cmake
>
>diff --git devel/cmake-core/files/patch-Modules_GNUInstallDirs.cmake devel/cmake-core/files/patch-Modules_GNUInstallDirs.cmake
>new file mode 100644
>index 000000000000..b935d2cd3855
>--- /dev/null
>+++ devel/cmake-core/files/patch-Modules_GNUInstallDirs.cmake
>@@ -0,0 +1,15 @@
>+--- Modules/GNUInstallDirs.cmake.orig	2023-03-27 21:42:13 UTC
>++++ Modules/GNUInstallDirs.cmake
>+@@ -408,6 +408,12 @@ macro(GNUInstallDirs_get_absolute_install_dir absvar v
>+       else()
>+         set(${absvar} "${CMAKE_INSTALL_PREFIX}/${${var}}")
>+       endif()
>++    elseif(CMAKE_SYSTEM_NAME MATCHES "^FreeBSD$")
>++      if("${GGAID_dir}" STREQUAL "LOCALSTATEDIR")
>++        set(${absvar} "/${${var}}")
>++      else()
>++        set(${absvar} "${CMAKE_INSTALL_PREFIX}/${${var}}")
>++      endif()
>+     else()
>+       set(${absvar} "${CMAKE_INSTALL_PREFIX}/${${var}}")
>+     endif()
>-- 
>2.39.1
>

Actions: View | Diff

Attachments on bug 270491: 241151