[vcpkg] Add Supports: field. Use contents of triplets instead of names for dependency resolution. (#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 (#8)

* Cmake var provider (#9)

* fix windows build (#10)

* Add missing files to build

* Fix test (#11)

* adding hooks for cmake variables in expressions

* Adding hooks for 'supports' in CI test

* Fix test (#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>

4 files changed, 126 insertions, 56 deletions

diff --git a/ports/grpc/00008-uwp_upb_disable_C4146_error.patch b/ports/grpc/00008-uwp_upb_disable_C4146_error.patch
deleted file mode 100644
index e2259e294..000000000
--- a/ports/grpc/00008-uwp_upb_disable_C4146_error.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/third_party/upb/upb/msg.c b/third_party/upb/upb/msg.c
-index a77da5665c..399e8753ba 100644
---- a/third_party/upb/upb/msg.c
-+++ b/third_party/upb/upb/msg.c
-@@ -33,17 +33,26 @@ static size_t upb_msg_sizeof(const upb_msglayout *l) {
- }
- 
- static upb_msg_internal *upb_msg_getinternal(upb_msg *msg) {
-+#pragma warning(push)
-+#pragma warning(disable : 4146)
-   return VOIDPTR_AT(msg, -sizeof(upb_msg_internal));
-+#pragma warning(pop)
- }
- 
- static const upb_msg_internal *upb_msg_getinternal_const(const upb_msg *msg) {
-+#pragma warning(push)
-+#pragma warning(disable : 4146)
-   return VOIDPTR_AT(msg, -sizeof(upb_msg_internal));
-+#pragma warning(pop)
- }
- 
- static upb_msg_internal_withext *upb_msg_getinternalwithext(
-     upb_msg *msg, const upb_msglayout *l) {
-   UPB_ASSERT(l->extendable);
-+#pragma warning(push)
-+#pragma warning(disable : 4146)
-   return VOIDPTR_AT(msg, -sizeof(upb_msg_internal_withext));
-+#pragma warning(pop)
- }
- 
- upb_msg *upb_msg_new(const upb_msglayout *l, upb_arena *a) {
diff --git a/ports/grpc/00009-use-system-upb.patch b/ports/grpc/00009-use-system-upb.patch
new file mode 100644
index 000000000..515238b9a
--- /dev/null
+++ b/ports/grpc/00009-use-system-upb.patch
@@ -0,0 +1,118 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index b535f10..0fcb682 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -1530,7 +1530,7 @@ target_link_libraries(grpc

+   ${_gRPC_UPB_LIBRARIES}

+   ${_gRPC_ALLTARGETS_LIBRARIES}

+   gpr

+-  upb

++  ${_gRPC_UPB_LIBRARIES}

+ )

+ if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)

+   target_link_libraries(grpc "-framework CoreFoundation")

+@@ -1941,7 +1941,7 @@ target_link_libraries(grpc_cronet

+   ${_gRPC_UPB_LIBRARIES}

+   ${_gRPC_ALLTARGETS_LIBRARIES}

+   gpr

+-  upb

++  ${_gRPC_UPB_LIBRARIES}

+ )

+ if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)

+   target_link_libraries(grpc_cronet "-framework CoreFoundation")

+@@ -2283,7 +2283,7 @@ target_link_libraries(grpc_test_util

+   ${_gRPC_ALLTARGETS_LIBRARIES}

+   gpr

+   grpc

+-  upb

++  ${_gRPC_UPB_LIBRARIES}

+ )

+ if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)

+   target_link_libraries(grpc_test_util "-framework CoreFoundation")

+@@ -2626,7 +2626,7 @@ target_link_libraries(grpc_test_util_unsecure

+   ${_gRPC_ALLTARGETS_LIBRARIES}

+   gpr

+   grpc_unsecure

+-  upb

++  ${_gRPC_UPB_LIBRARIES}

+ )

+ if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)

+   target_link_libraries(grpc_test_util_unsecure "-framework CoreFoundation")

+@@ -3017,7 +3017,7 @@ target_link_libraries(grpc_unsecure

+   ${_gRPC_UPB_LIBRARIES}

+   ${_gRPC_ALLTARGETS_LIBRARIES}

+   gpr

+-  upb

++  ${_gRPC_UPB_LIBRARIES}

+ )

+ if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)

+   target_link_libraries(grpc_unsecure "-framework CoreFoundation")

+@@ -3553,7 +3553,7 @@ target_link_libraries(grpc++

+   ${_gRPC_ALLTARGETS_LIBRARIES}

+   grpc

+   gpr

+-  upb

++  ${_gRPC_UPB_LIBRARIES}

+ )

+ 

+ foreach(_hdr

+@@ -4817,7 +4817,7 @@ target_link_libraries(grpc++_unsecure

+   ${_gRPC_ALLTARGETS_LIBRARIES}

+   gpr

+   grpc_unsecure

+-  upb

++  ${_gRPC_UPB_LIBRARIES}

+ )

+ 

+ foreach(_hdr

+@@ -5848,7 +5848,7 @@ if(gRPC_INSTALL)

+ endif()

+ 

+ endif()

+-

++if(0)

+ add_library(upb

+   third_party/upb/upb/decode.c

+   third_party/upb/upb/encode.c

+@@ -5888,10 +5888,10 @@ target_include_directories(upb

+ target_link_libraries(upb

+   ${_gRPC_ALLTARGETS_LIBRARIES}

+ )

++endif()

+ 

+ 

+-

+-if(gRPC_INSTALL)

++if(gRPC_INSTALL AND 0)

+   install(TARGETS upb EXPORT gRPCTargets

+     RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}

+     LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}

+diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in

+index 504d5a7..e2a3122 100644

+--- a/cmake/gRPCConfig.cmake.in

++++ b/cmake/gRPCConfig.cmake.in

+@@ -3,6 +3,7 @@

+ @_gRPC_FIND_PROTOBUF@

+ @_gRPC_FIND_SSL@

+ @_gRPC_FIND_CARES@

++find_package(upb CONFIG)

+ 

+ # Targets

+ include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake)

+diff --git a/cmake/upb.cmake b/cmake/upb.cmake

+index 2c0ab84..746e067 100644

+--- a/cmake/upb.cmake

++++ b/cmake/upb.cmake

+@@ -12,9 +12,9 @@

+ # See the License for the specific language governing permissions and

+ # limitations under the License.

+ 

+-set(UPB_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/upb)

++find_package(upb REQUIRED)

++set(_gRPC_UPB_INCLUDE_DIR)

+ 

+-set(_gRPC_UPB_INCLUDE_DIR "${UPB_ROOT_DIR}")

+ set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated")

+ 

+-set(_gRPC_UPB_LIBRARIES upb)

++set(_gRPC_UPB_LIBRARIES upb::upb)

diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL
index 4f5652a8b..790e19e8d 100644
--- a/ports/grpc/CONTROL
+++ b/ports/grpc/CONTROL
@@ -1,5 +1,5 @@
 Source: grpc
-Version: 1.26.0
-Build-Depends: zlib, openssl, protobuf, c-ares (!uwp)
+Version: 1.26.0-1
+Build-Depends: zlib, openssl, protobuf, c-ares (!uwp), upb
 Homepage: https://github.com/grpc/grpc
 Description: An RPC library and framework
diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake
index 9e925898c..e156ea4d5 100644
--- a/ports/grpc/portfile.cmake
+++ b/ports/grpc/portfile.cmake
@@ -1,15 +1,7 @@
-include(vcpkg_common_functions)
-
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
+if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 endif()
 
-# This snippet is a workaround for users who are upgrading from an extremely old version of this
-# port, which cloned directly into `src\`
-if(EXISTS "${CURRENT_BUILDTREES_DIR}/src/.git")
-    file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src)
-endif()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO grpc/grpc
@@ -23,28 +15,19 @@ vcpkg_from_github(
         00004-link-gdi32-on-windows.patch
         00005-fix-uwp-error.patch
         00006-crypt32.patch
-        00008-uwp_upb_disable_C4146_error.patch
+        00009-use-system-upb.patch
 )
 
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
     set(gRPC_BUILD_CODEGEN OFF)
 else()
     set(gRPC_BUILD_CODEGEN ON)
 endif()
 
-if(VCPKG_CRT_LINKAGE STREQUAL "static")
-    set(gRPC_MSVC_STATIC_RUNTIME ON)
-else()
-    set(gRPC_MSVC_STATIC_RUNTIME OFF)
-endif()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    set(gRPC_STATIC_LINKING ON)
-else()
-    set(gRPC_STATIC_LINKING OFF)
-endif()
+string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" gRPC_MSVC_STATIC_RUNTIME)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" gRPC_STATIC_LINKING)
 
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+if(VCPKG_TARGET_IS_UWP)
     set(cares_CARES_PROVIDER OFF)
 else()
     set(cares_CARES_PROVIDER "package")