[rollup:2021-08-09] Rollup PR #19469

strega-nil-ms · 2021-08-09T17:52:07Z

[rollup:2021-08-09] PR [scripts-audit] vcpkg_fixup_pkgconfig #19348 (@strega-nil)
[rollup:2021-08-09] PR [tinyfiledialogs] Fix for good #19338 (@strega-nil)
[rollup:2021-08-09] PR [scripts-audit] vcpkg_find_fortran #19239 (@strega-nil)
[rollup:2021-08-09] PR [scripts-audit] vcpkg_download_distfile #19238 (@strega-nil)
[rollup:2021-08-09] PR [vcpkg_fixup_cmake_targets] Fix up OSX system development path #16706 (@JackBoosY)

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for vcpkg-cmake-config but no changes to version or port version.
-- Version: 2021-05-22#1
-- Old SHA: 330cc51bc99c6b71ed5fb51901f6f838684015a5
-- New SHA: 791ff9abbc9720842f09dda6d4b5f07a1269b21b
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

PhoebeHui · 2021-08-11T10:12:11Z

CMake Error at scripts/cmake/vcpkg_fixup_cmake_targets.cmake:244 (vcpkg_internal_get_cmake_vars):
  Unknown CMake command "vcpkg_internal_get_cmake_vars".
Call Stack (most recent call first):
  ports/curl/portfile.cmake:91 (vcpkg_fixup_cmake_targets)
  scripts/ports.cmake:140 (include)

[vcpkg_fixup_cmake_targets] Fix up OSX system development path

[scripts-audit] vcpkg_download_distfile

[scripts-audit] vcpkg_find_fortran

[tinyfiledialogs] Fix for good

[scripts-audit] vcpkg_fixup_pkgconfig

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 69478c5caafcde4c490bb1fccb960296801dbb5f -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/v-/vcpkg-cmake-config.json b/versions/v-/vcpkg-cmake-config.json
index d1ec441..affac6b 100644
--- a/versions/v-/vcpkg-cmake-config.json
+++ b/versions/v-/vcpkg-cmake-config.json
@@ -5,11 +5,6 @@
       "version-date": "2021-08-11",
       "port-version": 0
     },
-    {
-      "git-tree": "279b4eab772c3c922b5880204647079b14f6d349",
-      "version-date": "2021-05-22",
-      "port-version": 2
-    },
     {
       "git-tree": "330cc51bc99c6b71ed5fb51901f6f838684015a5",
       "version-date": "2021-05-22",

BillyONeal · 2021-08-13T23:15:32Z

Sorry for the reset of a world rebuild :(. Pushed merge with master to shut down the older VMs and to get the fix for embree which we know would fail here anyway after there was an existing Linux failure.

strega-nil-ms · 2021-08-16T20:42:27Z

Merging since gdal was failing with this already, and the paraview failure isn't caused by this either.

dg0yt · 2021-08-16T21:21:03Z

gdal fails due to a pc file issue with libcurl. This is new. Curl was updated recently without failures in gdal. So I assume the pkgconfig fixup is broken now.

configure:20016: $PKG_CONFIG --exists --print-errors "libcurl"
Package " was not found in the pkg-config search path.
Perhaps you should add the directory containing `".pc'
to the PKG_CONFIG_PATH environment variable
Package '"', required by 'libcurl', not found
configure:20019: $? = 1
configure:20074: result:         found libcurl version 
configure:20079: checking for library containing curl_global_init
configure:20110: gcc -o conftest -DHAVE_AVX_AT_COMPILE_TIME -DHAVE_SSSE3_AT_COMPILE_TIME -DHAVE_SSE_AT_COMPILE_TIME -fPIC -fPIC  -g -DDEBUG -ftrapv -fvisibility=hidden  -L/mnt/vcpkg-ci/installed/x64-linux/debug/lib  conftest.c  >&5
/usr/bin/ld: /tmp/ccTbLeVO.o: in function `main':
/mnt/vcpkg-ci/buildtrees/gdal/x64-linux-dbg/conftest.c:99: undefined reference to `curl_global_init'

Empty elements?

[rollup:2021-08-09] Rollup PR (microsoft#19469)

Co-authored-by: Robert Schumacher <[email protected]>

[vcpkg_fixup_pkgconfig] HOTFIX -- revert microsoft#19469 (microsoft#19607)

ras0219-msft · 2021-08-18T21:52:28Z

Thanks @dg0yt ; I've fixed the libcurl issue with #19607 (with independent confirmation). Let me know if it still doesn't work for you!

…19469 (#19633) * [vcpkg_cmake_config_fixup] Revert #19469 * Update the version date * actually just revert * move stuff around in vcpkg-cmake-config.json file Co-authored-by: nicole mazzuca <[email protected]>

JackBoos · 2021-10-07T15:14:03Z

scripts/cmake/vcpkg_download_distfile.cmake

+function(z_vcpkg_download_distfile_test_hash path kind error_advice sha512 skip_sha512)
+    if(_VCPKG_INTERNAL_NO_HASH_CHECK)
+        # When using the internal hash skip, do not output an explicit message.
+        return()
+    endif()
+    if(skip_sha512)
+        message(STATUS "Skipping hash check for ${file_path}.")
+        return()
+    endif()
+
+    file(SHA512 "${path}" file_hash)
+    if(NOT "${file_hash}" STREQUAL "${sha512}")
+        message(FATAL_ERROR
+            "\nFile does not have expected hash:\n"
+            "        File path: [ ${file_path} ]\n"
+            "    Expected hash: [ ${sha512} ]\n"
+            "      Actual hash: [ ${file_hash} ]\n"
+            "${CUSTOM_ERROR_ADVICE}\n")
+    endif()
+endfunction()


Some parameters are incorrect here:

kind

error_advice

sha512

skip_sha512

These args are not used or not be passed.

github-actions bot requested changes Aug 9, 2021

View reviewed changes

strega-nil-ms force-pushed the rollup-2021-08-09 branch from 20c30d6 to 82c6b84 Compare August 9, 2021 18:09

github-actions bot approved these changes Aug 9, 2021

View reviewed changes

JonLiu1993 assigned PhoebeHui Aug 10, 2021

PhoebeHui added category:rollup A rollup PR. To be merged as soon as it's green. info:internal This PR or Issue was filed by the vcpkg team. labels Aug 10, 2021

github-actions bot approved these changes Aug 10, 2021

View reviewed changes

strega-nil added 8 commits August 11, 2021 10:07

[rollup:2021-08-09] PR microsoft#16706 (@JackBoosY)

c145cbc

[vcpkg_fixup_cmake_targets] Fix up OSX system development path

[rollup:2021-08-09] PR microsoft#19238 (@strega-nil)

53af506

[scripts-audit] vcpkg_download_distfile

[rollup:2021-08-09] PR microsoft#19239 (@strega-nil)

ab5f6f8

[scripts-audit] vcpkg_find_fortran

[rollup:2021-08-09] PR microsoft#19338 (@strega-nil)

e2890b9

[tinyfiledialogs] Fix for good

[rollup:2021-08-09] PR microsoft#19348 (@strega-nil)

4d441a0

[scripts-audit] vcpkg_fixup_pkgconfig

fix ports.cmake with newer vcpkg_download_distfile

ab325d2

fix vcpkg create

ff14dbd

move vcpkg_common_definitions down so that it's not incorrect

61eed5a

strega-nil-ms force-pushed the rollup-2021-08-09 branch from f1bc931 to e82fa28 Compare August 11, 2021 17:11

github-actions bot requested changes Aug 11, 2021

View reviewed changes

fix vcpkg_internal_get_cmake_vars

a982a7e

strega-nil-ms force-pushed the rollup-2021-08-09 branch from e82fa28 to a982a7e Compare August 11, 2021 17:13

github-actions bot approved these changes Aug 11, 2021

View reviewed changes

Merge branch 'master' into rollup-2021-08-09

3767d00

github-actions bot approved these changes Aug 13, 2021

View reviewed changes

Merge remote-tracking branch 'origin/master' into HEAD

a9f794b

github-actions bot approved these changes Aug 13, 2021

View reviewed changes

Neumann-A mentioned this pull request Aug 16, 2021

[Qt 6.2] Update Qt6 to 6.2 #18687

Merged

4 tasks

strega-nil-ms merged commit 99e06a6 into microsoft:master Aug 16, 2021

Jimmy-Hu added a commit to Jimmy-Hu/vcpkg that referenced this pull request Aug 16, 2021

Merge pull request #712 from microsoft/master

0c69431

[rollup:2021-08-09] Rollup PR (microsoft#19469)

ras0219 pushed a commit to ras0219/vcpkg that referenced this pull request Aug 17, 2021

[vcpkg_fixup_pkgconfig] HOTFIX -- revert microsoft#19469

02a791f

ras0219 mentioned this pull request Aug 17, 2021

[vcpkg_fixup_pkgconfig] HOTFIX -- revert #19469 #19607

Merged

ras0219-msft added a commit that referenced this pull request Aug 17, 2021

[vcpkg_fixup_pkgconfig] HOTFIX -- revert #19469 (#19607)

d679a1e

Co-authored-by: Robert Schumacher <[email protected]>

Jimmy-Hu added a commit to Jimmy-Hu/vcpkg that referenced this pull request Aug 17, 2021

Merge pull request #713 from microsoft/master

ab58ca4

[vcpkg_fixup_pkgconfig] HOTFIX -- revert microsoft#19469 (microsoft#19607)

JackBoosY mentioned this pull request Aug 18, 2021

[vcpkg-fixup-cmake-targets] Rewrite the traversal code with -framework NAME on OSX #19629

Closed

PhoebeHui added a commit to PhoebeHui/vcpkg that referenced this pull request Aug 18, 2021

[vcpkg_cmake_config_fixup] Revert microsoft#19469

9089270

PhoebeHui mentioned this pull request Aug 18, 2021

[vcpkg baseline][paraview:x64-osx][vcpkg_cmake_config_fixup] Revert #19469 #19633

Merged

aizuon mentioned this pull request Aug 19, 2021

[ffmpeg] build failure #19647

Closed

JackBoos reviewed Oct 7, 2021

View reviewed changes

JackBoos mentioned this pull request Oct 7, 2021

[z_vcpkg_download_distfile_test_hash] Some parameters are incorrect #20574

Closed

JackBoosY mentioned this pull request Oct 8, 2021

[vcpkg_download_distfile] Fix the parameter mismatch issues of some internal functions and fix the recursive call (step 3) #20585

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[rollup:2021-08-09] Rollup PR #19469

[rollup:2021-08-09] Rollup PR #19469

strega-nil-ms commented Aug 9, 2021

github-actions bot left a comment

PhoebeHui commented Aug 11, 2021

github-actions bot left a comment

BillyONeal commented Aug 13, 2021

strega-nil-ms commented Aug 16, 2021

dg0yt commented Aug 16, 2021

ras0219-msft commented Aug 18, 2021

JackBoos Oct 7, 2021

[rollup:2021-08-09] Rollup PR #19469

[rollup:2021-08-09] Rollup PR #19469

Conversation

strega-nil-ms commented Aug 9, 2021

github-actions bot left a comment

Choose a reason for hiding this comment

PhoebeHui commented Aug 11, 2021

github-actions bot left a comment

Choose a reason for hiding this comment

BillyONeal commented Aug 13, 2021

strega-nil-ms commented Aug 16, 2021

dg0yt commented Aug 16, 2021

ras0219-msft commented Aug 18, 2021

JackBoos Oct 7, 2021

Choose a reason for hiding this comment