[grpc] Control libsystemd installation order, cleanup (microsoft#46457)

Author: dg0yt

ports/grpc/portfile.cmake

@@ -18,7 +18,6 @@ vcpkg_from_github(
         00016-fix-plugin-targets.patch
         00017-add-src-upb.patch
 )
-# Ensure de-vendoring
 file(REMOVE_RECURSE
     "${SOURCE_PATH}/third_party/abseil-cpp"
     "${SOURCE_PATH}/third_party/cares"
@@ -35,16 +34,16 @@ endif()
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" gRPC_MSVC_STATIC_RUNTIME)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" gRPC_STATIC_LINKING)
 
+set(cares_CARES_PROVIDER "package")
 if(VCPKG_TARGET_IS_UWP)
-    set(cares_CARES_PROVIDER OFF)
-else()
-    set(cares_CARES_PROVIDER "package")
+    set(cares_CARES_PROVIDER "OFF")
 endif()
 
 vcpkg_check_features(
     OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        codegen gRPC_BUILD_CODEGEN
+        codegen     gRPC_BUILD_CODEGEN
+        systemd     gRPC_USE_SYSTEMD
 )
 
 vcpkg_cmake_configure(
@@ -71,12 +70,19 @@ vcpkg_cmake_configure(
         -DgRPC_DOWNLOAD_ARCHIVES=OFF
     MAYBE_UNUSED_VARIABLES
         gRPC_MSVC_STATIC_RUNTIME
+        gRPC_USE_SYSTEMD
 )
 
 vcpkg_cmake_install(ADD_BIN_TO_PATH)
-
+vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup()
 
+if (VCPKG_TARGET_IS_WINDOWS)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
+else()
+    vcpkg_fixup_pkgconfig()
+endif()
+
 if (gRPC_BUILD_CODEGEN)
     vcpkg_copy_tools(
         AUTO_CLEAN
@@ -95,11 +101,4 @@ endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include")
 
-vcpkg_copy_pdbs()
-if (VCPKG_TARGET_IS_WINDOWS)
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
-else()
-    vcpkg_fixup_pkgconfig()
-endif()
-
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

ports/grpc/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "grpc",
   "version-semver": "1.71.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "gRPC is a modern, open source, high-performance remote procedure call (RPC) framework that can run anywhere. gRPC enables client and server applications to communicate transparently, and simplifies the building of connected systems.",
   "homepage": "https://github.com/grpc/grpc",
   "license": "Apache-2.0",
@@ -45,6 +45,12 @@
     "codegen": {
       "description": "Build code generator machinery",
       "supports": "!uwp"
+    },
+    "systemd": {
+      "description": "Build with libsystemd support",
+      "dependencies": [
+        "libsystemd"
+      ]
     }
   }
 }

versions/baseline.json

@@ -3418,7 +3418,7 @@
     },
     "grpc": {
       "baseline": "1.71.0",
-      "port-version": 1
+      "port-version": 2
     },
     "grppi": {
       "baseline": "0.4.0",

versions/g-/grpc.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a37d18e67a105dca819b5dabbee6a0b079c8abd4",
+      "version-semver": "1.71.0",
+      "port-version": 2
+    },
     {
       "git-tree": "fe12b2f1ba6da9373174a6954aec7038f4278a2e",
       "version-semver": "1.71.0",