From f4b724887d631c95812f383d9b84b15a085df19e Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 30 May 2023 14:17:43 -0700 Subject: [PATCH 1/4] Update vcpkg-tool to 2023-05-31 + xbox triplets cleanup https://github.com/microsoft/vcpkg-tool/releases/tag/2023-05-30 + https://github.com/microsoft/vcpkg-tool/releases/tag/2023-05-31 Clean up xbox triplets following teaching vcpkg.exe about xbox more directly. Also deletes the seemingly-no-longer-used vcpkg_get_dep_info.cmake and vcpkg_get_tags.cmake. --- ports/vcpkg-cmake/vcpkg.json | 2 +- ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 4 +++ scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 10 +++--- scripts/cmake/vcpkg_common_definitions.cmake | 4 +++ scripts/cmake/vcpkg_configure_cmake.cmake | 4 +++ scripts/test_ports/cmake-user/portfile.cmake | 4 +++ scripts/toolchains/xbox.cmake | 6 ++-- scripts/vcpkg_get_dep_info.cmake | 19 ----------- scripts/vcpkg_get_tags.cmake | 33 ------------------- .../community/x64-xbox-scarlett-static.cmake | 8 +---- triplets/community/x64-xbox-scarlett.cmake | 8 +---- .../community/x64-xbox-xboxone-static.cmake | 8 +---- triplets/community/x64-xbox-xboxone.cmake | 8 +---- versions/baseline.json | 2 +- versions/v-/vcpkg-cmake.json | 5 +++ 16 files changed, 35 insertions(+), 92 deletions(-) delete mode 100644 scripts/vcpkg_get_dep_info.cmake delete mode 100644 scripts/vcpkg_get_tags.cmake diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index 7052cc9831f498..79c63522ed89b3 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-cmake", - "version-date": "2022-12-22", + "version-date": "2023-05-04", "documentation": "https://vcpkg.io/en/docs/maintainers/ports/vcpkg-cmake.html", "license": "MIT" } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index 746991f983d67d..d7e673751d5cc3 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -132,6 +132,10 @@ function(vcpkg_cmake_configure) vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}") endif() + if(DEFINED VCPKG_XBOX_CONSOLE_TARGET) + vcpkg_list(APPEND arg_OPTIONS "-DXBOX_CONSOLE_TARGET=${VCPKG_XBOX_CONSOLE_TARGET}") + endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") vcpkg_list(APPEND arg_OPTIONS "-DBUILD_SHARED_LIBS=ON") elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 5a360e047b3ef7..e6583182d136c7 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2023-04-07' +$versionDate = '2023-05-31' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { & "$scriptsDir/tls12-download-arm64.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 4960766360b605..a11998c5531b33 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -128,23 +128,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2023-04-07" +vcpkgToolReleaseTag="2023-05-31" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="2a2805aa251a9523311c813e9e68896f18805fed4ace301c603f4afac3940b27d4ef1d3b4572c8f93ce4d13ac613720275b9e21e39cc5d19115d2fc849bfe2bb" + vcpkgToolReleaseSha="edc535c373b613369534bae19aa3b7d906f2e00a3d92eb04608bb8284cbf1ff88ff617d10c998a94e5a62e4aee228078a13579ed71e0e5162d78ffa628201500" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="d8dc48e6dc866f4ebe3919c0bf1377769d6c6f1ad2dab7fc09da9b26f7dac3ab3b06affb585ece7ba72e2fdeacdc77b8df31ad08cff49e4c060b7647fc1cc22a" + vcpkgToolReleaseSha="b856d6bf81d53239efc65c378991635e859c3236d6fb33d54e894605bea0d65450f4ae338cbb86e2c63987c9ef36c615636c3ebd84b1a9466b31274088ce19f9" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="f26aaf5f503b9fd0a8b206230df19af966390d7087a9f3342f24c2d5e73f1f1bd81cba2695a89c87015ec822bd41bf836c2a9ef9f0e11acc61d6d9593aa8fae9" + vcpkgToolReleaseSha="053b2fbcc72c778b4e55cdc482751cdd5e1e70e63f11c7e3179aa6aeee0d283783aca1de8d4e3c98f41c980ce1baa3a15f2778ea1143122fd53b860a990ba130" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="89dc32154e22f6a51fa18a8ea22c16263533546469f73cdb4ee168ab7c68ebc2b2a93177284dc03ecf2d2ca438f9fd583def48844788942e98ea45027e8ec2fa" + vcpkgToolReleaseSha="c55c2e4e47ee313ddcbead3afd02c555ff4a125f185a5c147c42d747b5806bbd3a3f9264c1272b5045dee864ee1659ed0e170bac9e5bb4b46ea390644572d533" fi # Do the download or build. diff --git a/scripts/cmake/vcpkg_common_definitions.cmake b/scripts/cmake/vcpkg_common_definitions.cmake index 58730a89780d14..b248208a2fb8e9 100644 --- a/scripts/cmake/vcpkg_common_definitions.cmake +++ b/scripts/cmake/vcpkg_common_definitions.cmake @@ -2,6 +2,10 @@ string(COMPARE NOTEQUAL "${TARGET_TRIPLET}" "${HOST_TRIPLET}" VCPKG_CROSSCOMPILI #Helper variable to identify the Target system. VCPKG_TARGET_IS_ if (NOT DEFINED VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "") set(VCPKG_TARGET_IS_WINDOWS ON) + + if(DEFINED VCPKG_XBOX_CONSOLE_TARGET AND NOT "${VCPKG_XBOX_CONSOLE_TARGET}" STREQUAL "") + set(VCPKG_TARGET_IS_XBOX ON) + endif() elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set(VCPKG_TARGET_IS_WINDOWS ON) set(VCPKG_TARGET_IS_UWP ON) diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 24c64a6ec11264..b051bf8216a9df 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -185,6 +185,10 @@ function(vcpkg_configure_cmake) endif() endif() + if(DEFINED VCPKG_XBOX_CONSOLE_TARGET) + vcpkg_list(APPEND arg_OPTIONS "-DXBOX_CONSOLE_TARGET=${VCPKG_XBOX_CONSOLE_TARGET}") + endif() + if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}") endif() diff --git a/scripts/test_ports/cmake-user/portfile.cmake b/scripts/test_ports/cmake-user/portfile.cmake index ab30c4ccd8a4ea..d9154ebc09d6f1 100644 --- a/scripts/test_ports/cmake-user/portfile.cmake +++ b/scripts/test_ports/cmake-user/portfile.cmake @@ -129,6 +129,10 @@ function(test_cmake_project) list(APPEND base_options "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}") endif() endif() + + if(DEFINED VCPKG_XBOX_CONSOLE_TARGET) + list(APPEND arg_OPTIONS "-DXBOX_CONSOLE_TARGET=${VCPKG_XBOX_CONSOLE_TARGET}") + endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(APPEND base_options -DBUILD_SHARED_LIBS=ON) diff --git a/scripts/toolchains/xbox.cmake b/scripts/toolchains/xbox.cmake index f96c8586ccb9eb..7bacf33679298a 100644 --- a/scripts/toolchains/xbox.cmake +++ b/scripts/toolchains/xbox.cmake @@ -12,14 +12,12 @@ endif() if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) set(CMAKE_SYSTEM_VERSION "${VCPKG_CMAKE_SYSTEM_VERSION}" CACHE STRING "" FORCE) +else() + set(CMAKE_SYSTEM_VERSION "10.0" CACHE STRING "" FORCE) endif() set(CMAKE_CROSSCOMPILING ON CACHE STRING "") -if(NOT DEFINED CMAKE_SYSTEM_VERSION) - set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "") -endif() - # Add the Microsoft GDK if present if (DEFINED ENV{GRDKLatest}) cmake_path(SET _vcpkg_grdk "$ENV{GRDKLatest}") diff --git a/scripts/vcpkg_get_dep_info.cmake b/scripts/vcpkg_get_dep_info.cmake deleted file mode 100644 index 92212b82d02ac1..00000000000000 --- a/scripts/vcpkg_get_dep_info.cmake +++ /dev/null @@ -1,19 +0,0 @@ -function(vcpkg_get_dep_info PORT VCPKG_TRIPLET_ID) - message("d8187afd-ea4a-4fc3-9aa4-a6782e1ed9af") - vcpkg_triplet_file(${VCPKG_TRIPLET_ID}) - - # GUID used as a flag - "cut here line" - message("c35112b6-d1ba-415b-aa5d-81de856ef8eb -VCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE} -VCPKG_CMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME} -VCPKG_CMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION} -VCPKG_LIBRARY_LINKAGE=${VCPKG_LIBRARY_LINKAGE} -VCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE} -VCPKG_DEP_INFO_OVERRIDE_VARS=${VCPKG_DEP_INFO_OVERRIDE_VARS} -CMAKE_HOST_SYSTEM_NAME=${CMAKE_HOST_SYSTEM_NAME} -CMAKE_HOST_SYSTEM_PROCESSOR=${CMAKE_HOST_SYSTEM_PROCESSOR} -CMAKE_HOST_SYSTEM_VERSION=${CMAKE_HOST_SYSTEM_VERSION} -CMAKE_HOST_SYSTEM=${CMAKE_HOST_SYSTEM} -e1e74b5c-18cb-4474-a6bd-5c1c8bc81f3f -8c504940-be29-4cba-9f8f-6cd83e9d87b7") -endfunction() diff --git a/scripts/vcpkg_get_tags.cmake b/scripts/vcpkg_get_tags.cmake deleted file mode 100644 index 6a948d129eb597..00000000000000 --- a/scripts/vcpkg_get_tags.cmake +++ /dev/null @@ -1,33 +0,0 @@ -function(vcpkg_get_tags PORT FEATURES VCPKG_TRIPLET_ID VCPKG_ABI_SETTINGS_FILE) - message("d8187afd-ea4a-4fc3-9aa4-a6782e1ed9af") - vcpkg_triplet_file(${VCPKG_TRIPLET_ID}) - - # GUID used as a flag - "cut here line" - message("c35112b6-d1ba-415b-aa5d-81de856ef8eb -VCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE} -VCPKG_CMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME} -VCPKG_CMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION} -VCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET} -VCPKG_VISUAL_STUDIO_PATH=${VCPKG_VISUAL_STUDIO_PATH} -VCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE} -VCPKG_BUILD_TYPE=${VCPKG_BUILD_TYPE} -VCPKG_LIBRARY_LINKAGE=${VCPKG_LIBRARY_LINKAGE} -VCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE} -VCPKG_DISABLE_COMPILER_TRACKING=${VCPKG_DISABLE_COMPILER_TRACKING} -e1e74b5c-18cb-4474-a6bd-5c1c8bc81f3f") - - # Just to enforce the user didn't set it in the triplet file - if (DEFINED VCPKG_PUBLIC_ABI_OVERRIDE) - set(VCPKG_PUBLIC_ABI_OVERRIDE) - message(WARNING "VCPKG_PUBLIC_ABI_OVERRIDE set in the triplet will be ignored.") - endif() - include("${VCPKG_ABI_SETTINGS_FILE}" OPTIONAL) - - message("c35112b6-d1ba-415b-aa5d-81de856ef8eb -VCPKG_PUBLIC_ABI_OVERRIDE=${VCPKG_PUBLIC_ABI_OVERRIDE} -VCPKG_ENV_PASSTHROUGH=${VCPKG_ENV_PASSTHROUGH} -VCPKG_ENV_PASSTHROUGH_UNTRACKED=${VCPKG_ENV_PASSTHROUGH_UNTRACKED} -VCPKG_LOAD_VCVARS_ENV=${VCPKG_LOAD_VCVARS_ENV} -e1e74b5c-18cb-4474-a6bd-5c1c8bc81f3f -8c504940-be29-4cba-9f8f-6cd83e9d87b7") -endfunction() diff --git a/triplets/community/x64-xbox-scarlett-static.cmake b/triplets/community/x64-xbox-scarlett-static.cmake index e7c6877089abf4..acf742674fab9b 100644 --- a/triplets/community/x64-xbox-scarlett-static.cmake +++ b/triplets/community/x64-xbox-scarlett-static.cmake @@ -1,10 +1,4 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE static) -set(VCPKG_ENV_PASSTHROUGH GameDKLatest GRDKLatest GXDKLatest) -set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) -set(VCPKG_CMAKE_CONFIGURE_OPTIONS "-DXBOX_CONSOLE_TARGET=scarlett") -set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../../scripts/toolchains/xbox.cmake") -set(VCPKG_LOAD_VCVARS_ENV ON) -set(VCPKG_TARGET_IS_XBOX ON) -set(VCPKG_DEP_INFO_OVERRIDE_VARS xbox) +set(VCPKG_XBOX_CONSOLE_TARGET scarlett) diff --git a/triplets/community/x64-xbox-scarlett.cmake b/triplets/community/x64-xbox-scarlett.cmake index 5faeb7cad1f9a3..0cf353b3a8e5fa 100644 --- a/triplets/community/x64-xbox-scarlett.cmake +++ b/triplets/community/x64-xbox-scarlett.cmake @@ -1,10 +1,4 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_ENV_PASSTHROUGH GameDKLatest GRDKLatest GXDKLatest) -set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) -set(VCPKG_CMAKE_CONFIGURE_OPTIONS "-DXBOX_CONSOLE_TARGET=scarlett") -set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../../scripts/toolchains/xbox.cmake") -set(VCPKG_LOAD_VCVARS_ENV ON) -set(VCPKG_TARGET_IS_XBOX ON) -set(VCPKG_DEP_INFO_OVERRIDE_VARS xbox) +set(VCPKG_XBOX_CONSOLE_TARGET scarlett) diff --git a/triplets/community/x64-xbox-xboxone-static.cmake b/triplets/community/x64-xbox-xboxone-static.cmake index a08e675b5611c6..1202acc8b55f7d 100644 --- a/triplets/community/x64-xbox-xboxone-static.cmake +++ b/triplets/community/x64-xbox-xboxone-static.cmake @@ -1,10 +1,4 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE static) -set(VCPKG_ENV_PASSTHROUGH GameDKLatest GRDKLatest GXDKLatest) -set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) -set(VCPKG_CMAKE_CONFIGURE_OPTIONS "-DXBOX_CONSOLE_TARGET=xboxone") -set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../../scripts/toolchains/xbox.cmake") -set(VCPKG_LOAD_VCVARS_ENV ON) -set(VCPKG_TARGET_IS_XBOX ON) -set(VCPKG_DEP_INFO_OVERRIDE_VARS xbox) +set(VCPKG_XBOX_CONSOLE_TARGET xboxone) diff --git a/triplets/community/x64-xbox-xboxone.cmake b/triplets/community/x64-xbox-xboxone.cmake index b9838cd073214f..36061fc775cea5 100644 --- a/triplets/community/x64-xbox-xboxone.cmake +++ b/triplets/community/x64-xbox-xboxone.cmake @@ -1,10 +1,4 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_ENV_PASSTHROUGH GameDKLatest GRDKLatest GXDKLatest) -set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) -set(VCPKG_CMAKE_CONFIGURE_OPTIONS "-DXBOX_CONSOLE_TARGET=xboxone") -set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../../scripts/toolchains/xbox.cmake") -set(VCPKG_LOAD_VCVARS_ENV ON) -set(VCPKG_TARGET_IS_XBOX ON) -set(VCPKG_DEP_INFO_OVERRIDE_VARS xbox) +set(VCPKG_XBOX_CONSOLE_TARGET xboxone) diff --git a/versions/baseline.json b/versions/baseline.json index 775e47acafad44..99b67ef1466edb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8361,7 +8361,7 @@ "port-version": 0 }, "vcpkg-cmake": { - "baseline": "2022-12-22", + "baseline": "2023-05-04", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 50bf5211394920..9d8b6f876bc125 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88a7058fc7fa73a9c4c99cfcae9d79e2abf87a5a", + "version-date": "2023-05-04", + "port-version": 0 + }, { "git-tree": "1913f86defd2140d0a6751be2d51952e4090efa4", "version-date": "2022-12-22", From bcc5a0503a92b9888f5684607a1358b560075eeb Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal Date: Wed, 31 May 2023 17:50:36 +0000 Subject: [PATCH 2/4] Fix new post-build-check failures. --- ports/kf5i18n/portfile.cmake | 11 +++++++++++ ports/kf5i18n/vcpkg.json | 1 + ports/qtbase/portfile.cmake | 16 ++++++++++++++++ ports/qtbase/vcpkg.json | 1 + ports/starlink-ast/portfile.cmake | 3 +++ ports/starlink-ast/vcpkg.json | 1 + ports/wt/portfile.cmake | 4 +++- ports/wt/vcpkg.json | 1 + versions/baseline.json | 8 ++++---- versions/k-/kf5i18n.json | 5 +++++ versions/q-/qtbase.json | 5 +++++ versions/s-/starlink-ast.json | 5 +++++ versions/w-/wt.json | 5 +++++ 13 files changed, 61 insertions(+), 5 deletions(-) diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index df311afab355d2..f4de6dfbfa3a04 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -38,3 +38,14 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) +# The following pattern has an absolute path, but is still ultimately relocatable, so skip absolute paths check: +# share\KF5I18n\KF5I18nMacros.cmake +# # The Python executable used for building ki18n will be used as a fallback +# # solution if it cannot be found in $PATH when building applications. +# set(_KI18N_PYTHON_EXECUTABLE "C:/Dev/vcpkg-downloads/tools/python/python-3.10.7-x64/python.exe") +# +# find_program(KI18N_PYTHON_EXECUTABLE NAMES python3 python2 python) +# if(NOT KI18N_PYTHON_EXECUTABLE) +# set(KI18N_PYTHON_EXECUTABLE "${_KI18N_PYTHON_EXECUTABLE}") +# endif() +set(VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK enabled) diff --git a/ports/kf5i18n/vcpkg.json b/ports/kf5i18n/vcpkg.json index 0ac9cf73782396..3f447ef49b1c58 100644 --- a/ports/kf5i18n/vcpkg.json +++ b/ports/kf5i18n/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5i18n", "version": "5.98.0", + "port-version": 1, "description": "Advanced internationalization framework", "homepage": "https://api.kde.org/frameworks/ki18n/html/index.html", "dependencies": [ diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index cc7e2974ffa91f..74e3f901c67c89 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -470,3 +470,19 @@ endif() 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) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index dfece584e0abc7..4aba737df1439b 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtbase", "version": "6.5.1", + "port-version": 1, "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, diff --git a/ports/starlink-ast/portfile.cmake b/ports/starlink-ast/portfile.cmake index 9f0e6c61cec62b..f04d12fd520b39 100644 --- a/ports/starlink-ast/portfile.cmake +++ b/ports/starlink-ast/portfile.cmake @@ -89,3 +89,6 @@ part of the process of building AST and is distributed under GPL. The AST distribution includes the ERFA library. See LICENSE below. ]]) + +# line directives are in preprocessed files installed by this port. +set(VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK enabled) diff --git a/ports/starlink-ast/vcpkg.json b/ports/starlink-ast/vcpkg.json index 932834422422c5..52812fa27683b6 100644 --- a/ports/starlink-ast/vcpkg.json +++ b/ports/starlink-ast/vcpkg.json @@ -1,6 +1,7 @@ { "name": "starlink-ast", "version": "9.2.10", + "port-version": 1, "description": "The AST library provides a comprehensive range of facilities for attaching world coordinate systems to astronomical data, for retrieving and interpreting that information and for generating graphical output based on it", "homepage": "https://starlink.eao.hawaii.edu/starlink/AST", "license": null, diff --git a/ports/wt/portfile.cmake b/ports/wt/portfile.cmake index 907d0d0c36b7b3..6b437fe1384ee5 100644 --- a/ports/wt/portfile.cmake +++ b/ports/wt/portfile.cmake @@ -89,7 +89,9 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/var" "${CURRENT_PACKAGES_DIR}/debug/var") # RUNDIR is only used for wtfcgi what we don't build. See https://redmine.webtoolkit.eu/issues/9646 -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Wt/WConfig.h" "#define RUNDIR \"${CURRENT_PACKAGES_DIR}/var/run/wt\"" "") +file(READ "${CURRENT_PACKAGES_DIR}/include/Wt/WConfig.h" W_CONFIG_H) +string(REGEX REPLACE "([\r\n])#define RUNDIR[^\r\n]+" "\\1// RUNDIR intentionally unset by vcpkg" W_CONFIG_H "${W_CONFIG_H}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/Wt/WConfig.h" "${W_CONFIG_H}") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/wt/vcpkg.json b/ports/wt/vcpkg.json index 5a5c0ceda8b9d0..79a25672709a72 100644 --- a/ports/wt/vcpkg.json +++ b/ports/wt/vcpkg.json @@ -1,6 +1,7 @@ { "name": "wt", "version": "4.9.1", + "port-version": 1, "description": "Wt is a C++ library for developing web applications", "homepage": "https://github.com/emweb/wt", "license": "GPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 99b67ef1466edb..2def9f7fcdd49f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3602,7 +3602,7 @@ }, "kf5i18n": { "baseline": "5.98.0", - "port-version": 0 + "port-version": 1 }, "kf5iconthemes": { "baseline": "5.98.0", @@ -6726,7 +6726,7 @@ }, "qtbase": { "baseline": "6.5.1", - "port-version": 0 + "port-version": 1 }, "qtcharts": { "baseline": "6.5.1", @@ -7762,7 +7762,7 @@ }, "starlink-ast": { "baseline": "9.2.10", - "port-version": 0 + "port-version": 1 }, "staticjson": { "baseline": "1.0.0", @@ -8646,7 +8646,7 @@ }, "wt": { "baseline": "4.9.1", - "port-version": 0 + "port-version": 1 }, "wtl": { "baseline": "10.0.10320", diff --git a/versions/k-/kf5i18n.json b/versions/k-/kf5i18n.json index 86c7ac0fc38bfc..d2e337d4d10a2c 100644 --- a/versions/k-/kf5i18n.json +++ b/versions/k-/kf5i18n.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2263f5dbba39bdf456b8f1606f29ab4dc6e66cb", + "version": "5.98.0", + "port-version": 1 + }, { "git-tree": "8ce72b628f7998df3f90bcf7f9d313d9242ad5d8", "version": "5.98.0", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 60c606d6e81025..e8484b8ca9e109 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5e0f416352dc6207bf48ac656e3747140232a31", + "version": "6.5.1", + "port-version": 1 + }, { "git-tree": "ce56d3e7af720645f1c4be18d11e659c1d3e48bf", "version": "6.5.1", diff --git a/versions/s-/starlink-ast.json b/versions/s-/starlink-ast.json index 1134be1b4df3d8..39bf3a8259f8c7 100644 --- a/versions/s-/starlink-ast.json +++ b/versions/s-/starlink-ast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80ebffe065a019a61881cb1af6e1fb37a4ca4708", + "version": "9.2.10", + "port-version": 1 + }, { "git-tree": "f79db80b697effc13bf43a3d370701e0e7a244c4", "version": "9.2.10", diff --git a/versions/w-/wt.json b/versions/w-/wt.json index 604e5150992c8b..890377e897afa1 100644 --- a/versions/w-/wt.json +++ b/versions/w-/wt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9dd116caa8830e2d131b0d3ffbcde1002aa12333", + "version": "4.9.1", + "port-version": 1 + }, { "git-tree": "3c2ab01f0b1932d0a5f62632fe26a28ea4a25faa", "version": "4.9.1", From e52fa685f1b6836fc55acba94c6044ffa4af3164 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 7 Jun 2023 16:31:51 -0700 Subject: [PATCH 3/4] Update to 2023-06-07 removing some telemetry. --- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index e6583182d136c7..c37d661c4c26af 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2023-05-31' +$versionDate = '2023-06-07' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { & "$scriptsDir/tls12-download-arm64.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index a11998c5531b33..1f392ff9e5abb3 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -128,23 +128,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2023-05-31" +vcpkgToolReleaseTag="2023-06-07" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="edc535c373b613369534bae19aa3b7d906f2e00a3d92eb04608bb8284cbf1ff88ff617d10c998a94e5a62e4aee228078a13579ed71e0e5162d78ffa628201500" + vcpkgToolReleaseSha="109879edb5e47e329532034afdd7edcc658be790555fe45fee20e0791457e0a42ff930a1450aa1f6faaa98732ed6a6abea2f53f5e5547adce987d8fa0c124df1" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="b856d6bf81d53239efc65c378991635e859c3236d6fb33d54e894605bea0d65450f4ae338cbb86e2c63987c9ef36c615636c3ebd84b1a9466b31274088ce19f9" + vcpkgToolReleaseSha="96ed9b3e4ac58b61f54147b2533fd563bebe69721aa972974c0de354a31092c4cc24094372d37d9eb7968433fffa0e29c5e5dfd80cfdf7a76d0db373b0890fad" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="053b2fbcc72c778b4e55cdc482751cdd5e1e70e63f11c7e3179aa6aeee0d283783aca1de8d4e3c98f41c980ce1baa3a15f2778ea1143122fd53b860a990ba130" + vcpkgToolReleaseSha="7bc383231533262b436610ddce21946ff4f558afe2763cac03f186593e4be50c9377ebf8af6ecae5783a0589fa5f2ec540da70544d53f348fc23c731782de629" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="c55c2e4e47ee313ddcbead3afd02c555ff4a125f185a5c147c42d747b5806bbd3a3f9264c1272b5045dee864ee1659ed0e170bac9e5bb4b46ea390644572d533" + vcpkgToolReleaseSha="148b85bd92fd9b53f66d0718b9bdf12d1a698cc5b15e491e093c170acd8aa59ae02fd65da0d79901ed9fa179e2bf3d9a1db046bb34e194f6c982ac6e2d7b73a0" fi # Do the download or build. From 804bc2b650a3447290ed361d415caef841a16cf3 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 7 Jun 2023 17:33:28 -0700 Subject: [PATCH 4/4] [redis-plus-plus] Add DISABLE_PARALLEL_CONFIGURE due to source tree write. --- ports/redis-plus-plus/portfile.cmake | 1 + ports/redis-plus-plus/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/r-/redis-plus-plus.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/redis-plus-plus/portfile.cmake b/ports/redis-plus-plus/portfile.cmake index fb1b9b789eaa18..3d4b152a8ca017 100644 --- a/ports/redis-plus-plus/portfile.cmake +++ b/ports/redis-plus-plus/portfile.cmake @@ -29,6 +29,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" REDIS_PLUS_PLUS_BUILD_ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DREDIS_PLUS_PLUS_USE_TLS=OFF -DREDIS_PLUS_PLUS_BUILD_STATIC=${REDIS_PLUS_PLUS_BUILD_STATIC} diff --git a/ports/redis-plus-plus/vcpkg.json b/ports/redis-plus-plus/vcpkg.json index 7d4cf1ffb5f61c..2f3b575f26cf91 100644 --- a/ports/redis-plus-plus/vcpkg.json +++ b/ports/redis-plus-plus/vcpkg.json @@ -1,6 +1,7 @@ { "name": "redis-plus-plus", "version-semver": "1.3.8", + "port-version": 1, "description": "This is a C++ client for Redis. It's based on hiredis, and written in C++ 11", "homepage": "https://github.com/sewenew/redis-plus-plus", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 1b82ad3277703d..a291fc9cefd77f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7066,7 +7066,7 @@ }, "redis-plus-plus": { "baseline": "1.3.8", - "port-version": 0 + "port-version": 1 }, "refl-cpp": { "baseline": "0.12.3", diff --git a/versions/r-/redis-plus-plus.json b/versions/r-/redis-plus-plus.json index 05ed755fca84fc..21de4ee44595f3 100644 --- a/versions/r-/redis-plus-plus.json +++ b/versions/r-/redis-plus-plus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6be6c4d075dc736952132603d31f0ca568a0edde", + "version-semver": "1.3.8", + "port-version": 1 + }, { "git-tree": "c359e3bd938ceb9f3f5cde1b8aa4e435c9123534", "version-semver": "1.3.8",