Skip to content

[qtbase] no absolute paths #31762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 1 commit into from
Jun 13, 2023
Merged

[qtbase] no absolute paths #31762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions ports/qtbase/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,18 +471,17 @@ if(VCPKG_CROSSCOMPILING)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/Qt6/Qt6Dependencies.cmake" "${CURRENT_HOST_INSTALLED_DIR}" "\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}")
endif()

# The following pattern exists in qt-cmake scripts, but is still relocatable, so disable the absolute paths check.
# warning: There should be no absolute paths, such as the following, in an installed package:
# Absolute paths were found in the following files:
# packages/qtbase_x64-linux/tools/Qt6/bin/qt-cmake-private
# packages/qtbase_x64-linux/tools/Qt6/bin/debug/qt-cmake-private
# packages/qtbase_x64-linux/tools/Qt6/bin/debug/qt-cmake
# packages/qtbase_x64-linux/tools/Qt6/bin/qt-cmake
#
# # Try to use original cmake, otherwise to make it relocatable, use any cmake found in PATH.
# original_cmake_path="/home/bion/vcpkg/downloads/tools/cmake-3.25.1-linux/cmake-3.25.1-linux-x86_64/bin/cmake"
# cmake_path=$original_cmake_path
# if ! test -f "$cmake_path"; then
# cmake_path="cmake"
# fi
set(VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK enabled)
function(remove_original_cmake_path file)
file(READ "${file}" _contents)
string(REGEX REPLACE "original_cmake_path=[^\n]*" "original_cmake_path=''" _contents "${_contents}")
file(WRITE "${file}" "${_contents}")
endfunction()

if(NOT VCPKG_TARGET_IS_WINDOWS)
foreach(file "qt-cmake" "qt-cmake-private")
remove_original_cmake_path("${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${file}")
if(NOT VCPKG_BUILD_TYPE)
remove_original_cmake_path("${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/debug/${file}")
endif()
endforeach()
endif()
2 changes: 1 addition & 1 deletion ports/qtbase/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "qtbase",
"version": "6.5.1",
"port-version": 1,
"port-version": 2,
"description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
"homepage": "https://www.qt.io/",
"license": null,
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6738,7 +6738,7 @@
},
"qtbase": {
"baseline": "6.5.1",
"port-version": 1
"port-version": 2
},
"qtcharts": {
"baseline": "6.5.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/qtbase.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "384ddcfe175f58d6f498c91f6b8e790bb6ad70ac",
"version": "6.5.1",
"port-version": 2
},
{
"git-tree": "f5e0f416352dc6207bf48ac656e3747140232a31",
"version": "6.5.1",
Expand Down