From 792ee2031878f2cb0bfd3772b08aa04ff2982d81 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Thu, 10 Jul 2025 17:55:34 +0100 Subject: [PATCH 1/2] depends: Force `CMAKE_EXPORT_NO_PACKAGE_REGISTRY=TRUE` When using CMake policies 3.14 and below, the `export(PACKAGE)` command by default populates the user package registry, which is stored outside the build tree. Setting the `CMAKE_EXPORT_NO_PACKAGE_REGISTRY` variable disables this side effect. In CMake 3.15 and later, this behavior is disabled by default, and the variable has no effect. Github-Pull: #32943 Rebased-From: 44f3bae300dcafbe53f9b07e6cc22a112833e579 --- depends/funcs.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/depends/funcs.mk b/depends/funcs.mk index 3c0dc7a7fca..5186083f239 100644 --- a/depends/funcs.mk +++ b/depends/funcs.mk @@ -186,6 +186,7 @@ $(1)_cmake=env CC="$$($(1)_cc)" \ -DCMAKE_INSTALL_LIBDIR=lib/ \ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=$(V) \ + -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY:BOOL=TRUE \ $$($(1)_config_opts) ifeq ($($(1)_type),build) $(1)_cmake += -DCMAKE_INSTALL_RPATH:PATH="$$($($(1)_type)_prefix)/lib" From a9a71b840d729332d940ebdf2cba6b53b82aa792 Mon Sep 17 00:00:00 2001 From: fanquake Date: Mon, 14 Jul 2025 13:37:48 +0100 Subject: [PATCH 2/2] doc: update release notes for 28.x --- doc/release-notes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/release-notes.md b/doc/release-notes.md index a9f527c2ef4..432f7cbf711 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -44,6 +44,7 @@ Notable changes ### Build - #32678 guix: warn and abort when SOURCE_DATE_EPOCH is set +- #32943 depends: Force CMAKE_EXPORT_NO_PACKAGE_REGISTRY=TRUE ### Doc @@ -56,6 +57,7 @@ Credits Thanks to everyone who directly contributed to this release: - fanquake +- Hennadii Stepanov - Sjors Provoost - willcl-ark - zaidmstrr