From 02cb165ef8050230b477358e4136e9f0acd83eb6 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 24 Jul 2024 15:42:41 +0200 Subject: [PATCH] coin: Unset DESTDIR after installation Keeping DESTDIR set to "{{.InstallRoot}}" after installation has potential to break other unintended CMake file(INSTALL) calls that take DESTDIR into account. This already happened for the CMake macOS POST_BUILD deployment API, which accidentally installed into the install root, when it shouldn't have. Unset the DESTDIR env var after we install Qt. We already do that in the cross-compiling Coin instructions, so this brings uniformity to the host builds as well. Pick-to: 6.8 Task-number: QTBUG-90820 Task-number: QTBUG-96232 Change-Id: I6aca31e36c67c8d4b293efd746c37a42ea9ca834 Reviewed-by: Alexey Edelev --- coin/instructions/cmake_module_build_instructions.yaml | 3 +++ coin/instructions/cmake_qtbase_build_instructions.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/coin/instructions/cmake_module_build_instructions.yaml b/coin/instructions/cmake_module_build_instructions.yaml index 262fbfe5405..9ff964a7cc3 100644 --- a/coin/instructions/cmake_module_build_instructions.yaml +++ b/coin/instructions/cmake_module_build_instructions.yaml @@ -74,6 +74,9 @@ instructions: variableName: DESTDIR variableValue: "{{.InstallRoot}}" - !include "{{qt/qtbase}}/call_host_install.yaml" + - type: EnvironmentVariable + variableName: DESTDIR + variableValue: "" - type: SignPackage enable_if: condition: and diff --git a/coin/instructions/cmake_qtbase_build_instructions.yaml b/coin/instructions/cmake_qtbase_build_instructions.yaml index 05c05d0bfbf..4d3cffda9a5 100644 --- a/coin/instructions/cmake_qtbase_build_instructions.yaml +++ b/coin/instructions/cmake_qtbase_build_instructions.yaml @@ -71,6 +71,9 @@ instructions: variableName: DESTDIR variableValue: "{{.InstallRoot}}" - !include "{{qt/qtbase}}/call_host_install.yaml" + - type: EnvironmentVariable + variableName: DESTDIR + variableValue: "" - type: SignPackage enable_if: condition: and