1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coin: Unset DESTDIR after installation

Browse Source 
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.

Task-number: QTBUG-90820
Task-number: QTBUG-96232
Change-Id: I6aca31e36c67c8d4b293efd746c37a42ea9ca834
Reviewed-by:  Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 02cb165ef8050230b477358e4136e9f0acd83eb6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexandru Croitor 2024-07-24 15:42:41 +02:00 committed by Qt Cherry-pick Bot
parent 00a1bdfbe1
commit 633013827a
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
coin/instructions/cmake_module_build_instructions.yaml
View File

@ -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

3
coin/instructions/cmake_qtbase_build_instructions.yaml
View File

@ -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