From ae8a787eccd55644d6291da0234d4850434678f0 Mon Sep 17 00:00:00 2001
From: Ivan Zhakov <ivan@apache.org>
Date: Thu, 25 Apr 2024 14:10:38 +0000
Subject: [PATCH] On '1.7.x-vcpkg' branch: Cleanup vcpkg features.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x-vcpkg@1917334 13f79535-47bb-0310-9956-ffa450edef68
---
 .github/workflows/windows-vcpkg.yml |  2 +-
 build/vcpkg/apr/portfile.cmake      |  8 --------
 build/vcpkg/apr/vcpkg.json          | 25 -------------------------
 3 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml
index 35925df8e0..1b935c5af2 100644
--- a/.github/workflows/windows-vcpkg.yml
+++ b/.github/workflows/windows-vcpkg.yml
@@ -18,7 +18,7 @@ jobs:
         port:
         - apr
         - apr[core]
-        - apr[crypto,dbd-sqlite3,dbd-odbc,private-headers,xlate]
+        - apr[private-headers]
       fail-fast: false
     
     name: "${{ matrix.port }}:${{ matrix.triplet }} on ${{ matrix.os }}"
diff --git a/build/vcpkg/apr/portfile.cmake b/build/vcpkg/apr/portfile.cmake
index 34163b2538..04ce1f8f3b 100644
--- a/build/vcpkg/apr/portfile.cmake
+++ b/build/vcpkg/apr/portfile.cmake
@@ -15,9 +15,6 @@ if (VCPKG_TARGET_IS_WINDOWS)
     vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         FEATURES
             private-headers INSTALL_PRIVATE_H
-            crypto FEATURE_CRYPTO
-            xlate FEATURE_XLATE
-            dbd-sqlite3 FEATURE_DBD_SQLITE3
     )
 
     string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" APR_BUILD_STATIC)
@@ -34,13 +31,8 @@ if (VCPKG_TARGET_IS_WINDOWS)
         OPTIONS
             -DAPR_BUILD_STATIC=${APR_BUILD_STATIC}
             -DAPR_BUILD_SHARED=${APR_BUILD_SHARED}
-            -DAPR_MODULAR_DSO=${APR_BUILD_SHARED}
             -DAPR_BUILD_TESTAPR=OFF
             -DINSTALL_PDB=OFF
-            -DAPU_HAVE_CRYPTO=${FEATURE_CRYPTO}
-            -DAPU_HAVE_ICONV=${FEATURE_XLATE}
-            -DAPU_HAVE_SQLITE3=${FEATURE_DBD_SQLITE3}
-            -DAPU_USE_EXPAT=${APU_USE_EXPAT}
             -DAPR_INSTALL_PRIVATE_H=${INSTALL_PRIVATE_H}
     )
 
diff --git a/build/vcpkg/apr/vcpkg.json b/build/vcpkg/apr/vcpkg.json
index 093c1a4ea7..a44ed585f9 100644
--- a/build/vcpkg/apr/vcpkg.json
+++ b/build/vcpkg/apr/vcpkg.json
@@ -18,33 +18,8 @@
     }
   ],
   "features": {
-    "crypto": {
-      "description": "Crypto support",
-      "dependencies": [
-        {
-          "name": "openssl",
-          "default-features": false,
-          "features": []
-        }
-      ]
-    },
-    "dbd-sqlite3": {
-      "description": "Build SQLite3 DBD driver",
-      "dependencies": [
-        "sqlite3"
-      ]
-    },
-    "dbd-odbc": {
-      "description": "Build ODBC DBD driver"
-    },
     "private-headers": {
       "description": "Install non-standard files required for building Apache httpd"
-    },
-    "xlate": {
-      "description": "Xlate support",
-      "dependencies": [
-        "libiconv"
-      ]
     }
   },
   "default-features": []