[vcpkg] Use triplet file results in dependency logic expressions #8601
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
But do nothing with the value
I only tried matching the already existing logic in the portfile.cmake.
Rastaban
changed the title
Rastaban
changed the title
vicroms
added
the
category:vcpkg-feature
|
There's a bug in the dependency graph calculation, transitive dependencies are not being added to the install plan. Examples: PS D:\src\vcpkg> ./vcpkg install libzippp
The following packages will be built and installed:
* libzip[core,bzip2,openssl]:x86-windows
libzippp[core]:x86-windows
Additional packages (*) will be modified to complete this operation.
Starting package 1/2: libzip:x86-windows
# Missing bzip and openssl packages in install planPS D:\src\vcpkg> ./vcpkg install opencv
The following packages will be built and installed:
opencv[dnn,jpeg,webp,opengl,tiff,png,core]:x86-windows
* opencv4[core,dnn,jpeg,webp,opengl,tiff,png]:x86-windows
Additional packages (*) will be modified to complete this operation.
Starting package 1/2: opencv4:x86-windows
# Missing a lot of dependencies |
|
It seems to be ignoring
Ignored direct dependency on |
cbezault
reviewed
Oct 15, 2019
toolsrc/src/vcpkg/build.cpp
Outdated
| spec.triplet(), | ||
| build_package_options, | ||
| var_provider, | ||
| std::move(*feature_dependencies), |
There was a problem hiding this comment.
These moves can get dropped, BuildPackageConfig takes const references to everything now.
| @@ -713,6 +673,14 @@ namespace vcpkg::Build | |||
| Hash::Algorithm::Sha1)); | |||
There was a problem hiding this comment.
Above we add the feature_list to the abi file. config.feature_list is no longer stable and should be sorted before being added to the abi file.
|
This PR is what we need! |
|
@vicroms, sigh, I probably introduced a bug in one of my last minute changes. |
cbezault
reviewed
Oct 16, 2019
toolsrc/src/vcpkg/dependencies.cpp
Outdated
| PackageSpec::from_name_and_triplet(dep.depend.name, m_spec.triplet()) | ||
| .value_or_exit(VCPKG_LINE_INFO), | ||
| dep_feature); | ||
| } |
There was a problem hiding this comment.
We need to add in the default FeatureSpec here. core is not in the feature list of dep.depend.features.
vicroms
reviewed
Jan 28, 2020
| "parser.h", | ||
| "lexer.h", | ||
| }; | ||
| static constexpr Span<const StringLiteral> restricted_lists[] = { |
There was a problem hiding this comment.
Shouldn't we add C++ Standard Library header names as well? At least one library (sfsexp) is known to install cstring.h directly into include/.
…o heavy conflicts.
…tags. A huge performance cost was loading the triplet files over and over; instead, we splice the sources into a macro and load it once, then just call that macro for each port. Remove use of hashing because we aren't cross-process-safe anyway (global static will do instead).
|
This looks like it has passed the CI. Before merging this, can we add more documentation as to what was changed (such as adding a new build policy)? |
|
Also, @winsoft666, as part of this PR I discovered that I resolved this by moving the includes into If you'd like me to open an issue, I'd be happy to do so. |
cbezault
reviewed
Feb 1, 2020
|
bless |
|
With this PR, I think we can further improve the CI test to add feature tests. |
4 tasks
strega-nil
pushed a commit
to strega-nil/vcpkg
that referenced
this pull request
May 5, 2021
…s for dependency resolution. (microsoft#8601) * remove unfinished "supports" tag * extract "supports" from control files But do nothing with the value * Start `Supports` documentation * Use Supports in a bunch of control files I only tried matching the already existing logic in the portfile.cmake. * Cmake var provider (microsoft#8) * Cmake var provider (microsoft#9) * fix windows build (microsoft#10) * Add missing files to build * Fix test (microsoft#11) * adding hooks for cmake variables in expressions * Adding hooks for 'supports' in CI test * Fix test (microsoft#12) * Add overrides to evaluation environment * use "supported" tag in CI testing * cleanup comment * Fix issues with PR * [var_provider] Get library linkage variables from triplet * Fix compilation errors in tests * Add unimplemented functions * Fix unit tests part 1 * Fix issue when buildtrees dir does not exist * Change binary output hash * Fix handling of * feature * Add core feature when using * * Do not add Default-Features when installing 'core' * [vcpkg] WIP. 6 failing tests. * [vcpkg] WIP. 1 failing tests. * [vcpkg] WIP. 0 failing tests. * [vcpkg] Removed 'remove_graph'. 0 failing tests. * [vcpkg] Removed 'install_graph'. 0 failing tests. * [vcpkg] Remove AnyAction; replace with ActionPlan * [vcpkg] Minor cleanup. * [vcpkg][z3][qt5-connectivity][qt5-purchasing] Improve error messages while parsing. Fix a few trivial port issues. * [vcpkg] Work around ICE with MSVC v140 * [vcpkg] Add purge on fail to decompress for CI * [vcpkg] Fix parsing of nested parentheses in qualifiers * [vcpkg] Fix Linux builds (explicit qualification in declaration) * [vcpkg] Fix Build-Depends implying default features. Fix qualified dependencies regression. * [mmx] Add to skip list and full rebuild -- mmx causes problems by installing 'sched.h' * [libpqxx][mqtt-cpp] Prevent installing include/CMakeLists.txt * [cppitertools] Fix installed include namespace (should be include/cppitertools) * [libsoundio] Move headers into soundio/ subdirectory as per original cmake * [ci.baseline] Temporarily skip charls due to conflict with dcmtk * [vcpkg] Add restricted include files post build check -- bump global abi version * [libsoundio] Hotfix stray line in portfile * [vcpkg] Fix regression: CMake information was not being displayed for build-and-install actions * [jsonnet] Fix installation of internal headers; use system nlohmann-json * [grpc][upb] Teach grpc to use packaged upb. Add find_package(upb). Remove inappropriate upb features. * [zfp] Move problematic 'include/bitstream.h' to 'include/zfp/bitstream.h' * [x265] Bump control version to trigger rebuild after zfp conflict * [akali] Disable parallel configure * [dirent][dlfcn-win32][getopt-win32][pthreads] Grandfather into VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS * [ci.baseline] Update baseline for improved upb support * [tgui] Disable parallel configure * [libiconv] Enable VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS * [aws-sdk-cpp] Disable parallel configure * [vcpkg] Implement policy VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS * [aws-sdk-cpp] Fix amount of escaping semicolons -- Note: I do not know the root cause requiring this change * [libodb-sqlite] Fix configuring into source directory * [gettext] Grandfather into VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS * [libodb] DISABLE_PARALLEL_CONFIGURE * [vcpkg] Add 'config.h' and 'local.h' to restricted header list * [mcpp] Remove unused and problematic include 'config.h' from installed files * [teemo] Move installed headers into subdirectory to prevent conflicts with x265 * [ci.baseline] Update current OSX. Skip libmesh on all platforms due to heavy conflicts. * [vcpkg] Add 'slice.h' as a restricted header * [osg] Improve accuracy of dependencies (disable some, add some to Depends) * [vcpkg] Skip invoking a subprocess for 0 specs in load_tag_vars * [ci.baseline] Skip mongo-c-driver on osx due to flakiness * [teemo] Fix incorrect include file read * [osg] Fix dependency typo: glut -> freeglut * [vcpkg] Recover some lost performance with the addition of vcpkg_get_tags. A huge performance cost was loading the triplet files over and over; instead, we splice the sources into a macro and load it once, then just call that macro for each port. Remove use of hashing because we aren't cross-process-safe anyway (global static will do instead). * [vcpkg] Change Supports atom 'windows' to include UWP. Improve Supports field documentation. * [vcpkg] Add docs for VCPKG_ENV_PASSTHROUGH and VCPKG_DEP_INFO_OVERRIDE_VARS * Fix typo Co-authored-by: Curtis J Bezault <curtbezault@gmail.com> Co-authored-by: Victor Romero <romerosanchezv@gmail.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously the logic expression evaluation would do a sub string search of the triplet name to determine if an identifier was 'true' or 'false'. With this PR it uses the actual values set inside the triplet file. Most of the changes to vcpkg.exe was refactoring the dependency logic to allow running the triplet file earlier so its results could be used in the qualified dependency resolution.
This PR also fixes the previously undocumented "Supports" CONTROL tag to also use the logic expression evaluation. Currently the only place the supports tag is used is in the
cicommand. This will help clean up the results in the CI pipeline - especially when things switch over to using the checked in baseline. The tag could also be used to provide better error messages on failure, but I will leave that for someone else to do in a later PR.The unit tests are not complete.