Skip to content
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.

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

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

Merged
merged 11 commits into from
Aug 16, 2021

Conversation

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 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
@PhoebeHui
Copy link
Contributor

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)

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Member

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.

@Neumann-A Neumann-A mentioned this pull request Aug 16, 2021
4 tasks
@strega-nil-ms
Copy link
Contributor Author

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

@strega-nil-ms strega-nil-ms merged commit 99e06a6 into microsoft:master Aug 16, 2021
@dg0yt
Copy link
Contributor

dg0yt commented Aug 16, 2021

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?

Jimmy-Hu added a commit to Jimmy-Hu/vcpkg that referenced this pull request Aug 16, 2021
ras0219 pushed a commit to ras0219/vcpkg that referenced this pull request Aug 17, 2021
ras0219-msft added a commit that referenced this pull request Aug 17, 2021
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Jimmy-Hu added a commit to Jimmy-Hu/vcpkg that referenced this pull request Aug 17, 2021
PhoebeHui added a commit to PhoebeHui/vcpkg that referenced this pull request Aug 18, 2021
@ras0219-msft
Copy link
Contributor

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

@aizuon aizuon mentioned this pull request Aug 19, 2021
strega-nil-ms pushed a commit that referenced this pull request Aug 20, 2021
…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 <mazzucan@outlook.com>
Comment on lines +61 to +80
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()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some parameters are incorrect here:

  • kind
  • error_advice
  • sha512
  • skip_sha512

These args are not used or not be passed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants