This is an automated email from the ASF dual-hosted git repository.
yuanzhou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new e4a3e2334d [VL] Clean up vcpkg overlay ports (#11121)
e4a3e2334d is described below
commit e4a3e2334daf82033d17c4fbf1ab9d7b8b96edff
Author: PHILO-HE <[email protected]>
AuthorDate: Mon Dec 1 21:13:01 2025 +0800
[VL] Clean up vcpkg overlay ports (#11121)
- Some of overlay ports were added because the previous baseline doesn't
contain the required library versions. As we have upgraded the baseline, some
of these ports can be removed.
- Some dependencies like gsasl are used for libhdfs3.so (native C++
support), not for libhdfs.so (JNI based API support) currently in use. We can
remove them.
- Upgrade simdjson to 4.1.0, aligning with Velox's requirement when finding
the package.
---
dev/vcpkg/ports/grpc/00001-fix-uwp.patch | 73 ----------------
.../ports/grpc/00002-static-linking-in-linux.patch | 16 ----
.../ports/grpc/00003-undef-base64-macro.patch | 13 ---
.../ports/grpc/00004-link-gdi32-on-windows.patch | 13 ---
dev/vcpkg/ports/grpc/00005-fix-uwp-error.patch | 47 ----------
dev/vcpkg/ports/grpc/00009-use-system-upb.patch | 91 --------------------
dev/vcpkg/ports/grpc/00012-fix-use-cxx17.patch | 16 ----
dev/vcpkg/ports/grpc/00014-pkgconfig-upbdefs.patch | 13 ---
.../grpc/00015-disable-download-archive.patch | 12 ---
dev/vcpkg/ports/grpc/gRPCTargets-vcpkg-tools.cmake | 10 ---
dev/vcpkg/ports/grpc/grpc_gcc9.patch | 13 ---
dev/vcpkg/ports/grpc/portfile.cmake | 99 ----------------------
dev/vcpkg/ports/grpc/snprintf.patch | 12 ---
dev/vcpkg/ports/grpc/vcpkg-cmake-wrapper.cmake | 2 -
dev/vcpkg/ports/grpc/vcpkg.json | 48 -----------
dev/vcpkg/ports/gsasl/fix-krb5-config.patch | 18 ----
dev/vcpkg/ports/gsasl/portfile.cmake | 27 ------
dev/vcpkg/ports/gsasl/vcpkg.json | 8 --
dev/vcpkg/ports/krb5/fix-pkgconfig.patch | 12 ---
dev/vcpkg/ports/krb5/portfile.cmake | 31 -------
dev/vcpkg/ports/krb5/vcpkg.json | 7 --
dev/vcpkg/ports/libdaxctl/fix-meson.patch | 94 --------------------
dev/vcpkg/ports/libdaxctl/portfile.cmake | 31 -------
dev/vcpkg/ports/libdaxctl/vcpkg.json | 7 --
dev/vcpkg/ports/libkmod/portfile.cmake | 19 -----
dev/vcpkg/ports/libkmod/vcpkg.json | 6 --
dev/vcpkg/ports/libntlm/portfile.cmake | 24 ------
dev/vcpkg/ports/libntlm/vcpkg.json | 8 --
dev/vcpkg/ports/libstemmer/CMakeLists.txt | 22 -----
dev/vcpkg/ports/libstemmer/portfile.cmake | 24 ------
dev/vcpkg/ports/libstemmer/vcpkg.json | 12 ---
dev/vcpkg/ports/simdjson/portfile.cmake | 2 +-
dev/vcpkg/ports/simdjson/vcpkg.json | 2 +-
dev/vcpkg/vcpkg.json | 8 +-
34 files changed, 6 insertions(+), 834 deletions(-)
diff --git a/dev/vcpkg/ports/grpc/00001-fix-uwp.patch
b/dev/vcpkg/ports/grpc/00001-fix-uwp.patch
deleted file mode 100644
index 2aea0afd76..0000000000
--- a/dev/vcpkg/ports/grpc/00001-fix-uwp.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 25990a5d8a..4bec4e1e72 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -219,6 +219,9 @@ if(UNIX)
- endif()
- if(WIN32)
- set(_gRPC_PLATFORM_WINDOWS ON)
-+ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-+ set(_gRPC_PLATFORM_UWP ON)
-+ endif()
- endif()
-
- # Use C11 standard
-@@ -263,6 +266,9 @@ if(MSVC)
- set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4267")
- # TODO(jtattermusch): needed to build boringssl with VS2017, revisit later
- set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4987 /wd4774 /wd4819 /wd4996
/wd4619")
-+ if(_gRPC_PLATFORM_UWP)
-+ add_definitions(-DGRPC_ARES=0)
-+ endif()
- # Silences thousands of trucation warnings
- set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4503")
- # Tell MSVC to build grpc using utf-8
-@@ -430,6 +436,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR})
- # ``.proto`` files
- #
- function(protobuf_generate_grpc_cpp)
-+ if(_gRPC_PLATFORM_UWP)
-+ return()
-+ endif()
-+
- if(NOT ARGN)
- message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without
any proto files")
- return()
-@@ -552,6 +562,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN)
- list(APPEND _gRPC_PLUGIN_LIST grpc_ruby_plugin)
- endif ()
-
-+if(NOT _gRPC_PLATFORM_UWP)
- add_custom_target(plugins
- DEPENDS ${_gRPC_PLUGIN_LIST}
- )
-@@ -567,6 +578,7 @@ add_custom_target(tools_cxx
-
- add_custom_target(tools
- DEPENDS tools_c tools_cxx)
-+endif()
-
- protobuf_generate_grpc_cpp_with_import_path_correction(
- src/proto/grpc/channelz/channelz.proto
src/proto/grpc/channelz/channelz.proto
-diff --git
a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
-index 5d2bdc14de..e9870c2656 100644
---- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
-+++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
-@@ -39,6 +39,7 @@ bool check_bios_data(const char*) { return false; }
- bool check_windows_registry_product_name(HKEY root_key,
- const char* reg_key_path,
- const char* reg_key_name) {
-+#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP
- const size_t kProductNameBufferSize = 256;
- char const expected_substr[] = "Google";
-
-@@ -71,6 +72,9 @@ bool check_windows_registry_product_name(HKEY root_key,
- }
-
- return strstr(buffer, expected_substr) != nullptr;
-+#else
-+ return false;
-+#endif
- }
-
- } // namespace internal
diff --git a/dev/vcpkg/ports/grpc/00002-static-linking-in-linux.patch
b/dev/vcpkg/ports/grpc/00002-static-linking-in-linux.patch
deleted file mode 100644
index 8999a24aea..0000000000
--- a/dev/vcpkg/ports/grpc/00002-static-linking-in-linux.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8f78306f77..e09f8fcc1e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -211,6 +211,11 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE)
- endif()
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
-
-+if (gRPC_STATIC_LINKING AND NOT _gRPC_PLATFORM_WINDOWS)
-+ # Force to static link
-+ set(CMAKE_EXE_LINKER_FLAGS "-Bstatic")
-+endif()
-+
- if(MSVC)
- include(cmake/msvc_static_runtime.cmake)
- add_definitions(-D_WIN32_WINNT=0x600 -D_SCL_SECURE_NO_WARNINGS
-D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS)
diff --git a/dev/vcpkg/ports/grpc/00003-undef-base64-macro.patch
b/dev/vcpkg/ports/grpc/00003-undef-base64-macro.patch
deleted file mode 100644
index be182659d4..0000000000
--- a/dev/vcpkg/ports/grpc/00003-undef-base64-macro.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/core/lib/transport/transport.cc
b/src/core/lib/transport/transport.cc
-index 5d74ec2..89494b5 100644
---- a/src/core/lib/transport/transport.cc
-+++ b/src/core/lib/transport/transport.cc
-@@ -77,6 +77,8 @@ void grpc_stream_ref_init(grpc_stream_refcount* refcount,
int /*initial_refs*/,
- : nullptr);
- }
-
-+#undef move64
-+
- static void move64bits(uint64_t* from, uint64_t* to) {
- *to += *from;
- *from = 0;
diff --git a/dev/vcpkg/ports/grpc/00004-link-gdi32-on-windows.patch
b/dev/vcpkg/ports/grpc/00004-link-gdi32-on-windows.patch
deleted file mode 100644
index 54b55c60b8..0000000000
--- a/dev/vcpkg/ports/grpc/00004-link-gdi32-on-windows.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 25990a5d8a..8a632d2289 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -404,7 +404,7 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/xds)
- endif()
-
- if(WIN32)
-- set(_gRPC_BASELIB_LIBRARIES ws2_32 crypt32)
-+ set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32)
- endif()
-
- # Create directory for proto source files
diff --git a/dev/vcpkg/ports/grpc/00005-fix-uwp-error.patch
b/dev/vcpkg/ports/grpc/00005-fix-uwp-error.patch
deleted file mode 100644
index 23f885d48e..0000000000
--- a/dev/vcpkg/ports/grpc/00005-fix-uwp-error.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc
b/src/core/ext/transport/chttp2/transport/hpack_parser.cc
-index b0d3a6465b..5c48f1aa30 100644
---- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc
-+++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc
-@@ -1037,7 +1037,7 @@ class HPackParser::Parser {
-
- private:
- void GPR_ATTRIBUTE_NOINLINE LogHeader(const HPackTable::Memento& memento) {
-- const char* type;
-+ const char* type = nullptr;
- switch (log_info_.type) {
- case LogInfo::kHeaders:
- type = "HDR";
-diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc
-index 898a62823c..6b31cdc082 100644
---- a/src/core/lib/slice/slice.cc
-+++ b/src/core/lib/slice/slice.cc
-@@ -188,6 +188,7 @@ grpc_slice
grpc_slice_from_moved_buffer(grpc_core::UniquePtr<char> p,
- size_t len) {
- uint8_t* ptr = reinterpret_cast<uint8_t*>(p.get());
- grpc_slice slice;
-+ memset(&slice, 0, sizeof(grpc_slice));
- if (len <= sizeof(slice.data.inlined.bytes)) {
- slice.refcount = nullptr;
- slice.data.inlined.length = len;
-@@ -206,7 +207,7 @@ grpc_slice
grpc_slice_from_moved_string(grpc_core::UniquePtr<char> p) {
- }
-
- grpc_slice grpc_slice_from_cpp_string(std::string str) {
-- grpc_slice slice;
-+ grpc_slice slice = { 0 };
- if (str.size() <= sizeof(slice.data.inlined.bytes)) {
- slice.refcount = nullptr;
- slice.data.inlined.length = str.size();
-diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc
-index 141b16e345..89d9d6dafd 100644
---- a/src/core/lib/surface/server.cc
-+++ b/src/core/lib/surface/server.cc
-@@ -902,7 +902,7 @@ grpc_call_error Server::QueueRequestedCall(size_t cq_idx,
RequestedCall* rc) {
- FailCall(cq_idx, rc, GRPC_ERROR_CREATE("Server Shutdown"));
- return GRPC_CALL_OK;
- }
-- RequestMatcherInterface* rm;
-+ RequestMatcherInterface* rm = nullptr;
- switch (rc->type) {
- case RequestedCall::Type::BATCH_CALL:
- rm = unregistered_request_matcher_.get();
diff --git a/dev/vcpkg/ports/grpc/00009-use-system-upb.patch
b/dev/vcpkg/ports/grpc/00009-use-system-upb.patch
deleted file mode 100644
index 8bafe8452b..0000000000
--- a/dev/vcpkg/ports/grpc/00009-use-system-upb.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 23098aa578..a8e8bc274b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -85,6 +85,9 @@ set_property(CACHE gRPC_SSL_PROVIDER PROPERTY STRINGS
"module" "package")
- set(gRPC_PROTOBUF_PROVIDER "module" CACHE STRING "Provider of protobuf
library")
- set_property(CACHE gRPC_PROTOBUF_PROVIDER PROPERTY STRINGS "module" "package")
-
-+set(gRPC_UPB_PROVIDER "module" CACHE STRING "Provider of upb library")
-+set_property(CACHE gRPC_UPB_PROVIDER PROPERTY STRINGS "module" "package")
-+
- set(gRPC_PROTOBUF_PACKAGE_TYPE "" CACHE STRING "Algorithm for searching
protobuf package")
- set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG"
"MODULE")
-
-@@ -1631,6 +1634,7 @@ target_link_libraries(gpr
- absl::time
- absl::optional
- absl::variant
-+ ${_gRPC_UPB_LIBRARIES}
- )
- if(_gRPC_PLATFORM_ANDROID)
- target_link_libraries(gpr
-@@ -2435,7 +2439,6 @@ target_link_libraries(grpc
- gpr
- ${_gRPC_SSL_LIBRARIES}
- address_sorting
-- upb
- )
- if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
- target_link_libraries(grpc "-framework CoreFoundation")
-@@ -2979,7 +2982,6 @@ target_link_libraries(grpc_unsecure
- absl::utility
- gpr
- address_sorting
-- upb
- )
- if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
- target_link_libraries(grpc_unsecure "-framework CoreFoundation")
-@@ -4251,6 +4253,7 @@ endif()
-
- endif()
-
-+if (gRPC_UPB_PROVIDER STREQUAL "module")
- add_library(upb
- third_party/upb/third_party/utf8_range/naive.c
- third_party/upb/third_party/utf8_range/range2-neon.c
-@@ -4319,7 +4322,7 @@ if(gRPC_INSTALL)
- ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
- )
- endif()
--
-+endif()
-
- if(gRPC_BUILD_TESTS)
-
-diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in
-index 3623f4aa5e..df6ced560e 100644
---- a/cmake/gRPCConfig.cmake.in
-+++ b/cmake/gRPCConfig.cmake.in
-@@ -8,6 +8,7 @@ list(APPEND CMAKE_MODULE_PATH
${CMAKE_CURRENT_LIST_DIR}/modules)
- @_gRPC_FIND_CARES@
- @_gRPC_FIND_ABSL@
- @_gRPC_FIND_RE2@
-+@_gRPC_FIND_UPB@
-
- # Targets
- include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake)
-diff --git a/cmake/upb.cmake b/cmake/upb.cmake
-index f2a0e508c3..09751f5ef0 100644
---- a/cmake/upb.cmake
-+++ b/cmake/upb.cmake
-@@ -12,9 +12,19 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
-
-+set(_gRPC_UPB_GRPC_GENERATED_DIR
"${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated"
"${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated")
-+if (gRPC_UPB_PROVIDER STREQUAL "module")
-+
- set(UPB_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/upb)
-
- set(_gRPC_UPB_INCLUDE_DIR "${UPB_ROOT_DIR}")
- set(_gRPC_UPB_GRPC_GENERATED_DIR
"${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated"
"${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated")
-
- set(_gRPC_UPB_LIBRARIES upb)
-+
-+elseif(gRPC_UPB_PROVIDER STREQUAL "package")
-+ find_package(upb CONFIG REQUIRED)
-+ set(_gRPC_UPB_LIBRARIES upb::fastdecode upb::json upb::upb
upb::utf8_range upb::textformat upb::reflection upb::descriptor_upb_proto)
-+ set(_gRPC_UPB_INCLUDE_DIR)
-+ set(_gRPC_FIND_UPB "if(NOT upb_FOUND)\n find_package(upb CONFIG
REQUIRED)\nendif()")
-+endif()
diff --git a/dev/vcpkg/ports/grpc/00012-fix-use-cxx17.patch
b/dev/vcpkg/ports/grpc/00012-fix-use-cxx17.patch
deleted file mode 100644
index 56bc436760..0000000000
--- a/dev/vcpkg/ports/grpc/00012-fix-use-cxx17.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 25990a5d8a..ba8df92858 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -326,6 +326,11 @@ include(cmake/xxhash.cmake)
- include(cmake/zlib.cmake)
- include(cmake/download_archive.cmake)
-
-+if (ABSL_USE_CXX17)
-+ message(STATUS "Found absl uses CXX17, enable CXX17 feature.")
-+ set(CMAKE_CXX_STANDARD 17)
-+endif()
-+
- # Setup external proto library at third_party/envoy-api with 2 download URLs
- if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/envoy-api)
- # Download the archive via HTTP, validate the checksum, and extract to
third_party/envoy-api.
diff --git a/dev/vcpkg/ports/grpc/00014-pkgconfig-upbdefs.patch
b/dev/vcpkg/ports/grpc/00014-pkgconfig-upbdefs.patch
deleted file mode 100644
index 1c2bda5b1b..0000000000
--- a/dev/vcpkg/ports/grpc/00014-pkgconfig-upbdefs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 48019cce95..1eda700ae8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -23186,7 +23186,7 @@ generate_pkgconfig(
- "high performance general RPC framework"
- "${gRPC_CORE_VERSION}"
- "gpr openssl absl_any_invocable absl_base absl_bind_front absl_cleanup
absl_cord absl_core_headers absl_flat_hash_map absl_flat_hash_set
absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional
absl_random_random absl_span absl_status absl_statusor absl_str_format
absl_strings absl_synchronization absl_time absl_type_traits absl_utility
absl_variant"
-- "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz"
-+ "-lgrpc -laddress_sorting -lre2 -lupb_textformat -lupb_mini_table -lupb
-lupb_collections -lupb_reflection -lupb_extension_registry -lupb_json
-lupb_fastdecode -lupb_utf8_range -ldescriptor_upb_proto -lcares -lz"
- ""
- "grpc.pc")
-
diff --git a/dev/vcpkg/ports/grpc/00015-disable-download-archive.patch
b/dev/vcpkg/ports/grpc/00015-disable-download-archive.patch
deleted file mode 100644
index b28bc72a7c..0000000000
--- a/dev/vcpkg/ports/grpc/00015-disable-download-archive.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/cmake/download_archive.cmake b/cmake/download_archive.cmake
-index 820aafafb7..a59b785c7e 100644
---- a/cmake/download_archive.cmake
-+++ b/cmake/download_archive.cmake
-@@ -19,6 +19,7 @@ file(MAKE_DIRECTORY ${_download_archive_TEMPORARY_DIR})
- # Note that strip_prefix strips the directory path prefix of the extracted
- # archive content, and it may strip multiple directories.
- function(download_archive destination url hash strip_prefix)
-+ return()
- # Fetch and validate
- set(_TEMPORARY_FILE
${_download_archive_TEMPORARY_DIR}/${strip_prefix}.tar.gz)
- message(STATUS "Downloading from ${url}, if failed, please try configuring
again")
diff --git a/dev/vcpkg/ports/grpc/gRPCTargets-vcpkg-tools.cmake
b/dev/vcpkg/ports/grpc/gRPCTargets-vcpkg-tools.cmake
deleted file mode 100644
index 1ed3509c94..0000000000
--- a/dev/vcpkg/ports/grpc/gRPCTargets-vcpkg-tools.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-file(GLOB GRPC_PLUGINS
"${_IMPORT_PREFIX}/../@HOST_TRIPLET@/tools/grpc/grpc_*_plugin*")
-
-foreach(PLUGIN ${GRPC_PLUGINS})
- get_filename_component(PLUGIN_NAME "${PLUGIN}" NAME_WE)
- add_executable(gRPC::${PLUGIN_NAME} IMPORTED)
- set_property(TARGET gRPC::${PLUGIN_NAME} APPEND PROPERTY
IMPORTED_CONFIGURATIONS RELEASE)
- set_target_properties(gRPC::${PLUGIN_NAME} PROPERTIES
- IMPORTED_LOCATION_RELEASE "${PLUGIN}"
- )
-endforeach()
diff --git a/dev/vcpkg/ports/grpc/grpc_gcc9.patch
b/dev/vcpkg/ports/grpc/grpc_gcc9.patch
deleted file mode 100644
index b64cbc1789..0000000000
--- a/dev/vcpkg/ports/grpc/grpc_gcc9.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/core/ext/xds/xds_listener.h b/src/core/ext/xds/xds_listener.h
-index 61427483f1..a3bfed0780 100644
---- a/src/core/ext/xds/xds_listener.h
-+++ b/src/core/ext/xds/xds_listener.h
-@@ -79,6 +79,8 @@ struct XdsListenerResource : public
XdsResourceType::ResourceData {
- };
-
- struct DownstreamTlsContext {
-+ DownstreamTlsContext() {}
-+
- CommonTlsContext common_tls_context;
- bool require_client_certificate = false;
-
diff --git a/dev/vcpkg/ports/grpc/portfile.cmake
b/dev/vcpkg/ports/grpc/portfile.cmake
deleted file mode 100644
index a88f371d6b..0000000000
--- a/dev/vcpkg/ports/grpc/portfile.cmake
+++ /dev/null
@@ -1,99 +0,0 @@
-if(VCPKG_TARGET_IS_WINDOWS)
- vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-endif()
-
-vcpkg_from_github(
- OUT_SOURCE_PATH SOURCE_PATH
- REPO grpc/grpc
- REF v1.51.1
- SHA512
1bc8e7a5a15b2dca88527d111cde398b0dc1921bbc945c6df8225b4225b8ac0b43155bcf743230ce7b5962d1ab948e9363229c98a879b1befc7a939a290fb888
- HEAD_REF master
- PATCHES
- 00001-fix-uwp.patch
- 00002-static-linking-in-linux.patch
- 00003-undef-base64-macro.patch
- 00004-link-gdi32-on-windows.patch
- 00005-fix-uwp-error.patch
- 00009-use-system-upb.patch
- snprintf.patch
- 00012-fix-use-cxx17.patch
- 00014-pkgconfig-upbdefs.patch
- 00015-disable-download-archive.patch
- grpc_gcc9.patch
-)
-
-if(NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET)
- vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc")
-endif()
-
-string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" gRPC_MSVC_STATIC_RUNTIME)
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" gRPC_STATIC_LINKING)
-
-if(VCPKG_TARGET_IS_UWP)
- set(cares_CARES_PROVIDER OFF)
-else()
- set(cares_CARES_PROVIDER "package")
-endif()
-
-vcpkg_check_features(
- OUT_FEATURE_OPTIONS FEATURE_OPTIONS
- FEATURES
- codegen gRPC_BUILD_CODEGEN
-)
-
-vcpkg_cmake_configure(
- SOURCE_PATH "${SOURCE_PATH}"
- OPTIONS ${FEATURE_OPTIONS}
- -DgRPC_INSTALL=ON
- -DgRPC_BUILD_TESTS=OFF
- -DgRPC_STATIC_LINKING=${gRPC_STATIC_LINKING}
- -DgRPC_MSVC_STATIC_RUNTIME=${gRPC_MSVC_STATIC_RUNTIME}
- -DgRPC_ZLIB_PROVIDER=package
- -DgRPC_SSL_PROVIDER=package
- -DgRPC_PROTOBUF_PROVIDER=package
- -DgRPC_ABSL_PROVIDER=package
- -DgRPC_UPB_PROVIDER=package
- -DgRPC_RE2_PROVIDER=package
- -DgRPC_PROTOBUF_PACKAGE_TYPE=CONFIG
- -DgRPC_CARES_PROVIDER=${cares_CARES_PROVIDER}
- -DgRPC_BENCHMARK_PROVIDER=none
- -DgRPC_INSTALL_BINDIR:STRING=bin
- -DgRPC_INSTALL_LIBDIR:STRING=lib
- -DgRPC_INSTALL_INCLUDEDIR:STRING=include
- -DgRPC_INSTALL_CMAKEDIR:STRING=share/grpc
-
"-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}"
-
"-DProtobuf_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}"
- MAYBE_UNUSED_VARIABLES
- gRPC_MSVC_STATIC_RUNTIME
-)
-
-vcpkg_cmake_install(ADD_BIN_TO_PATH)
-
-vcpkg_cmake_config_fixup()
-
-if (gRPC_BUILD_CODEGEN)
- vcpkg_copy_tools(
- AUTO_CLEAN
- TOOL_NAMES
- grpc_php_plugin
- grpc_python_plugin
- grpc_node_plugin
- grpc_objective_c_plugin
- grpc_csharp_plugin
- grpc_cpp_plugin
- grpc_ruby_plugin
- )
-else()
- configure_file("${CMAKE_CURRENT_LIST_DIR}/gRPCTargets-vcpkg-tools.cmake"
"${CURRENT_PACKAGES_DIR}/share/grpc/gRPCTargets-vcpkg-tools.cmake" @ONLY)
-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()
-
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION
"${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/dev/vcpkg/ports/grpc/snprintf.patch
b/dev/vcpkg/ports/grpc/snprintf.patch
deleted file mode 100644
index b5012ad2db..0000000000
--- a/dev/vcpkg/ports/grpc/snprintf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/core/tsi/alts/crypt/aes_gcm.cc
b/src/core/tsi/alts/crypt/aes_gcm.cc
-index b761224..88a3d6b 100644
---- a/src/core/tsi/alts/crypt/aes_gcm.cc
-+++ b/src/core/tsi/alts/crypt/aes_gcm.cc
-@@ -19,6 +19,7 @@
- #include <grpc/support/port_platform.h>
-
- #include <string.h>
-+#include <cstdio>
-
- #include <openssl/bio.h>
- #include <openssl/buffer.h>
diff --git a/dev/vcpkg/ports/grpc/vcpkg-cmake-wrapper.cmake
b/dev/vcpkg/ports/grpc/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index 9adf028808..0000000000
--- a/dev/vcpkg/ports/grpc/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-list(REMOVE_AT ARGS 0)
-_find_package(gRPC ${ARGS}) # Shouldn't this be fixed downstream instead of
using a Wrapper?
\ No newline at end of file
diff --git a/dev/vcpkg/ports/grpc/vcpkg.json b/dev/vcpkg/ports/grpc/vcpkg.json
deleted file mode 100644
index 35dd585098..0000000000
--- a/dev/vcpkg/ports/grpc/vcpkg.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
- "name": "grpc",
- "version-semver": "1.51.1",
- "port-version": 1,
- "description": "An RPC library and framework",
- "homepage": "https://github.com/grpc/grpc";,
- "license": "Apache-2.0",
- "dependencies": [
- "abseil",
- {
- "name": "c-ares",
- "platform": "!uwp"
- },
- {
- "name": "grpc",
- "host": true,
- "features": [
- "codegen"
- ]
- },
- "openssl",
- "protobuf",
- {
- "name": "protobuf",
- "host": true
- },
- "re2",
- "upb",
- {
- "name": "vcpkg-cmake",
- "host": true
- },
- {
- "name": "vcpkg-cmake-config",
- "host": true
- },
- "zlib"
- ],
- "features": {
- "absl-sync": {
- "description": "Deprecated."
- },
- "codegen": {
- "description": "Build code generator machinery",
- "supports": "!uwp"
- }
- }
-}
diff --git a/dev/vcpkg/ports/gsasl/fix-krb5-config.patch
b/dev/vcpkg/ports/gsasl/fix-krb5-config.patch
deleted file mode 100644
index a1c2b90f6b..0000000000
--- a/dev/vcpkg/ports/gsasl/fix-krb5-config.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- gsasl-2.2.0.orig/configure.ac 2022-08-19 08:39:48.000000000 +0000
-+++ gsasl-2.2.0/configure.ac 2023-06-09 03:37:46.236461664 +0000
-@@ -279,12 +279,9 @@
- fi
- elif test "$gssapi_impl" = "mit"; then
- AC_MSG_NOTICE([trying MIT])
-- AC_PATH_PROGS(KRB5_CONFIG, [krb5-config.mit krb5-config], no)
-- if test "$KRB5_CONFIG" != "no" ; then
-- GSS_CFLAGS="`$KRB5_CONFIG --cflags`"
-- GSS_LIBS="`$KRB5_CONFIG --libs gssapi`"
-- else
-- AC_MSG_WARN([MIT Kerberos krb5-config not found, disabling GSSAPI])
-+ PKG_CHECK_MODULES(GSS, krb5-gssapi, found_krb5_gssapi=yes,
found_krb5_gssapi=no)
-+ if test "$found_krb5_gssapi" = "no" ; then
-+ AC_MSG_WARN([MIT Kerberos not found, disabling GSSAPI])
- gssapi_impl=no
- fi
- elif test "$gssapi_impl" = "heimdal"; then
diff --git a/dev/vcpkg/ports/gsasl/portfile.cmake
b/dev/vcpkg/ports/gsasl/portfile.cmake
deleted file mode 100644
index 56d451bf9e..0000000000
--- a/dev/vcpkg/ports/gsasl/portfile.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-vcpkg_download_distfile(ARCHIVE
- URLS "https://ftp.gnu.org/gnu/gsasl/gsasl-2.2.0.tar.gz";
"https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gsasl/gsasl-2.2.0.tar.gz";
- FILENAME "gsasl-2.2.0.tar.gz"
- SHA512
0ae318a8616fe675e9718a3f04f33731034f9a7ba03d83ccb1a72954ded54ced35dc7c7e173fdcb6fa0f0813f8891c6cbcedf8bf70b37d00b8ec512eb9f07f5f
-)
-
-vcpkg_extract_source_archive_ex(
- OUT_SOURCE_PATH SOURCE_PATH
- ARCHIVE "${ARCHIVE}"
- PATCHES fix-krb5-config.patch
-)
-
-vcpkg_configure_make(
- SOURCE_PATH ${SOURCE_PATH}
- OPTIONS
- # --disable-ntlm
- --without-stringprep
- --with-gssapi-impl=mit
-)
-vcpkg_install_make()
-vcpkg_fixup_pkgconfig()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools")
-
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
\ No newline at end of file
diff --git a/dev/vcpkg/ports/gsasl/vcpkg.json b/dev/vcpkg/ports/gsasl/vcpkg.json
deleted file mode 100644
index f169ffc6e3..0000000000
--- a/dev/vcpkg/ports/gsasl/vcpkg.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "name": "gsasl",
- "version": "2.2.0",
- "dependencies": [
- "krb5",
- "libntlm"
- ]
-}
diff --git a/dev/vcpkg/ports/krb5/fix-pkgconfig.patch
b/dev/vcpkg/ports/krb5/fix-pkgconfig.patch
deleted file mode 100644
index cbd847043a..0000000000
--- a/dev/vcpkg/ports/krb5/fix-pkgconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/build-tools/mit-krb5.pc.in b/src/build-tools/mit-krb5.pc.in
-index fdc5577..177aedf 100644
---- a/src/build-tools/mit-krb5.pc.in
-+++ b/src/build-tools/mit-krb5.pc.in
-@@ -11,5 +11,5 @@ Name: mit-krb5
- Description: An implementation of Kerberos network authentication
- Version: @KRB5_VERSION@
- Cflags: -I${includedir}
--Libs: -L${libdir} -lkrb5 -lk5crypto @COM_ERR_LIB@
--Libs.private: -lkrb5support
-+Libs: -L${libdir} -lkrb5 -lk5crypto @COM_ERR_LIB@
-+Libs.private: -lkrb5support -lresolv -ldl
diff --git a/dev/vcpkg/ports/krb5/portfile.cmake
b/dev/vcpkg/ports/krb5/portfile.cmake
deleted file mode 100644
index 4b416c9fce..0000000000
--- a/dev/vcpkg/ports/krb5/portfile.cmake
+++ /dev/null
@@ -1,31 +0,0 @@
-vcpkg_download_distfile(ARCHIVE
- URLS "https://kerberos.org/dist/krb5/1.20/krb5-1.20.tar.gz";
- FILENAME "krb5-1.20.tar.gz"
- SHA512
9aed84a971a4d74188468870260087ec7c3a614cceb5fe32ad7da1cb8db3d66e00df801c9f900f0131ac56eb828674b8be93df474c2d13b892b70c7977388604
-)
-
-# for gcc >= 10
-set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -fcommon")
-
-vcpkg_extract_source_archive_ex(
- OUT_SOURCE_PATH SOURCE_PATH
- ARCHIVE "${ARCHIVE}"
- PATCHES fix-pkgconfig.patch
-)
-
-vcpkg_configure_make(
- SOURCE_PATH ${SOURCE_PATH}/src
- OPTIONS --without-keyutils
-)
-vcpkg_install_make()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools")
-
-foreach(KRB5_SUBDIR_TO_REMOVE bin share lib/krb5 var)
- file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/${KRB5_SUBDIR_TO_REMOVE}")
- file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/${KRB5_SUBDIR_TO_REMOVE}")
-endforeach()
-
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/doc/copyright.rst")
-vcpkg_fixup_pkgconfig()
\ No newline at end of file
diff --git a/dev/vcpkg/ports/krb5/vcpkg.json b/dev/vcpkg/ports/krb5/vcpkg.json
deleted file mode 100644
index 86c0a6f815..0000000000
--- a/dev/vcpkg/ports/krb5/vcpkg.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "name": "krb5",
- "version": "1.20",
- "dependencies": [
-
- ]
-}
diff --git a/dev/vcpkg/ports/libdaxctl/fix-meson.patch
b/dev/vcpkg/ports/libdaxctl/fix-meson.patch
deleted file mode 100644
index e46402f07d..0000000000
--- a/dev/vcpkg/ports/libdaxctl/fix-meson.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/daxctl/lib/meson.build b/daxctl/lib/meson.build
-index b79c6e5..ca5f114 100644
---- a/daxctl/lib/meson.build
-+++ b/daxctl/lib/meson.build
-@@ -42,3 +42,4 @@ custom_target(
- )
-
- install_data('daxctl.conf', install_dir : datadir / 'daxctl')
-+install_headers('../libdaxctl.h', subdir : 'daxctl')
-diff --git a/meson.build b/meson.build
-index 990d621..a3e4e53 100644
---- a/meson.build
-+++ b/meson.build
-@@ -30,10 +30,6 @@ prefixdir = get_option('prefix')
- if not prefixdir.startswith('/')
- error('Prefix is not absolute: "@0@"'.format(prefixdir))
- endif
--if prefixdir != rootprefixdir and rootprefixdir != '/' and not
prefixdir.strip('/').startswith(rootprefixdir.strip('/') + '/')
-- error('Prefix is not below root prefix (now rootprefix=@0@
prefix=@1@)'.format(
-- rootprefixdir, prefixdir))
--endif
-
- libdir = join_paths(prefixdir, get_option('libdir'))
- rootlibdir = get_option('rootlibdir')
-@@ -140,9 +136,7 @@ versiondep = declare_dependency(
- )
-
- kmod = dependency('libkmod')
--libudev = dependency('libudev')
- uuid = dependency('uuid')
--json = dependency('json-c')
- if get_option('libtracefs').enabled()
- traceevent = dependency('libtraceevent')
- tracefs = dependency('libtracefs')
-@@ -170,25 +164,6 @@ cc = meson.get_compiler('c')
- # keyutils lacks pkgconfig
- keyutils = cc.find_library('keyutils', required : get_option('keyutils'))
-
--# iniparser lacks pkgconfig and its header files are either at '/usr/include'
or '/usr/include/iniparser'
--# Use the path provided by user via meson configure -Diniparserdir=<somepath>
--# if thats not provided then try searching for 'iniparser.h' in default
system include path
--# and if that not found then as a last resort try looking at
'/usr/include/iniparser'
--iniparser_headers = ['iniparser.h', 'dictionary.h']
--
--message('Looking for iniparser include headers', iniparser_headers)
--
--iniparserdir = include_directories(includedir / get_option('iniparserdir'),
is_system:true)
--iniparser = cc.find_library('iniparser', required :
(get_option('iniparserdir') != '') ,
-- has_headers :iniparser_headers ,header_include_directories :
iniparserdir)
--
--if not iniparser.found()
-- iniparserdir = include_directories(includedir / 'iniparser',
is_system:true)
-- iniparser = cc.find_library('iniparser', required : true, has_headers :
iniparser_headers,
-- header_include_directories : iniparserdir)
--endif
--iniparser = declare_dependency(include_directories: iniparserdir,
dependencies:iniparser)
--
- conf = configuration_data()
- check_headers = [
- ['HAVE_DLFCN_H', 'dlfcn.h'],
-@@ -268,13 +243,6 @@ foreach ident : ['secure_getenv', '__secure_getenv']
- conf.set10('HAVE_' + ident.to_upper(), cc.has_function(ident))
- endforeach
-
--conf.set10('HAVE_JSON_U64',
-- cc.has_function('json_object_new_uint64',
-- prefix : '''#include <json-c/json.h>''',
-- dependencies : json,
-- )
--)
--
- ndctlconf_dir = sysconfdir / 'ndctl.conf.d'
- ndctlconf = ndctlconf_dir / 'monitor.conf'
- conf.set_quoted('NDCTL_CONF_FILE', ndctlconf)
-@@ -317,19 +285,6 @@ ccan = static_library('ccan',
- ccan_dep = declare_dependency(link_with : ccan)
-
- subdir('daxctl/lib')
--subdir('ndctl/lib')
--subdir('cxl/lib')
--subdir('util')
--subdir('ndctl')
--subdir('daxctl')
--subdir('cxl')
--if get_option('docs').enabled()
-- subdir('Documentation/ndctl')
-- subdir('Documentation/daxctl')
-- subdir('Documentation/cxl')
--endif
--subdir('test')
--subdir('contrib')
-
- # only support spec file generation from git builds
- if version_tag == ''
diff --git a/dev/vcpkg/ports/libdaxctl/portfile.cmake
b/dev/vcpkg/ports/libdaxctl/portfile.cmake
deleted file mode 100644
index 0461a0e299..0000000000
--- a/dev/vcpkg/ports/libdaxctl/portfile.cmake
+++ /dev/null
@@ -1,31 +0,0 @@
-vcpkg_download_distfile(ARCHIVE
- URLS "https://github.com/pmem/ndctl/archive/refs/tags/v76.1.tar.gz";
- FILENAME "v76.1.tar.gz"
- SHA512
76d32599df029969734276f8972f3f4bf701e471117c8a48d1f96b62c87a59ac54d59104ee62d1cbbb518a06a779677ca856df32ce6218d758a8c73daa3e5b06
-)
-
-vcpkg_extract_source_archive_ex(
- OUT_SOURCE_PATH SOURCE_PATH
- ARCHIVE "${ARCHIVE}"
- PATCHES fix-meson.patch
-)
-
-vcpkg_configure_meson(
- SOURCE_PATH ${SOURCE_PATH}
- OPTIONS
- -Dlibtracefs=disabled
- -Ddocs=disabled
- -Dsystemd=disabled
- -Dkeyutils=disabled
- OPTIONS_RELEASE
- -Drootprefix=${CURRENT_PACKAGES_DIR}
- OPTIONS_DEBUG
- -Drootprefix=${CURRENT_PACKAGES_DIR}/debug
-)
-
-vcpkg_install_meson()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSES/preferred/LGPL-2.1")
-vcpkg_fixup_pkgconfig()
\ No newline at end of file
diff --git a/dev/vcpkg/ports/libdaxctl/vcpkg.json
b/dev/vcpkg/ports/libdaxctl/vcpkg.json
deleted file mode 100644
index 21c2530529..0000000000
--- a/dev/vcpkg/ports/libdaxctl/vcpkg.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "name": "libdaxctl",
- "version": "76.1",
- "homepage": "https://github.com/pmem/ndctl";,
- "description": " A 'device memory' enabling project encompassing tools and
libraries for CXL, NVDIMMs, DAX, memory tiering and other platform memory
device topics.",
- "dependencies": ["libuuid", "libkmod"]
-}
diff --git a/dev/vcpkg/ports/libkmod/portfile.cmake
b/dev/vcpkg/ports/libkmod/portfile.cmake
deleted file mode 100644
index bf45a4b584..0000000000
--- a/dev/vcpkg/ports/libkmod/portfile.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-set(VCPKG_LIBRARY_LINKAGE dynamic)
-
-vcpkg_download_distfile(ARCHIVE
- URLS
"https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kmod/kmod-30.tar.xz";
- FILENAME "kmod-30.tar.xz"
- SHA512
e2cd34e600a72e44710760dfda9364b790b8352a99eafbd43e683e4a06f37e6b5c0b5d14e7c28070e30fc5fc6ceddedf7b97f3b6c2c5c2d91204fefd630b9a3e
-)
-
-vcpkg_extract_source_archive_ex(
- OUT_SOURCE_PATH SOURCE_PATH
- ARCHIVE "${ARCHIVE}"
-)
-
-vcpkg_configure_make(SOURCE_PATH ${SOURCE_PATH})
-vcpkg_install_make()
-
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-vcpkg_fixup_pkgconfig()
\ No newline at end of file
diff --git a/dev/vcpkg/ports/libkmod/vcpkg.json
b/dev/vcpkg/ports/libkmod/vcpkg.json
deleted file mode 100644
index cc77056dd9..0000000000
--- a/dev/vcpkg/ports/libkmod/vcpkg.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "name": "libkmod",
- "version": "30",
- "homepage": "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git";,
- "description": "Linux kernel module management tools and library"
-}
diff --git a/dev/vcpkg/ports/libntlm/portfile.cmake
b/dev/vcpkg/ports/libntlm/portfile.cmake
deleted file mode 100644
index 16c726e168..0000000000
--- a/dev/vcpkg/ports/libntlm/portfile.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-vcpkg_download_distfile(ARCHIVE
- URLS
"https://gitlab.com/gsasl/libntlm/-/archive/libntlm-1-5/libntlm-libntlm-1-5.tar.gz";
- FILENAME "libntlm-libntlm-1-5.tar.gz"
- SHA512
8fa98c3ab3fe67fbb04c7806cd8af9bd4e8e38163f9eb59bfbb0c80fc3667bc49f50d917931d1eb4eb3664168e69b062246d098ed81f4ecd63d503829da5277e
-)
-
-vcpkg_extract_source_archive_ex(
- OUT_SOURCE_PATH SOURCE_PATH
- ARCHIVE "${ARCHIVE}"
-)
-
-
-vcpkg_configure_make(
- SOURCE_PATH ${SOURCE_PATH}
- OPTIONS
-)
-vcpkg_install_make()
-vcpkg_fixup_pkgconfig()
-
-# file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-# file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools")
-
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
\ No newline at end of file
diff --git a/dev/vcpkg/ports/libntlm/vcpkg.json
b/dev/vcpkg/ports/libntlm/vcpkg.json
deleted file mode 100644
index 49ea899b75..0000000000
--- a/dev/vcpkg/ports/libntlm/vcpkg.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "name": "libntlm",
- "version": "1.5",
- "homepage": "https://gitlab.com/gsasl/libntlm/";,
- "description": "Simon Josefsson's NTLM authentication library",
- "dependencies": [ ],
- "default-features": []
-}
diff --git a/dev/vcpkg/ports/libstemmer/CMakeLists.txt
b/dev/vcpkg/ports/libstemmer/CMakeLists.txt
deleted file mode 100644
index 787bb26ec3..0000000000
--- a/dev/vcpkg/ports/libstemmer/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-cmake_minimum_required(VERSION 3.8.0)
-
-project(libstemmer)
-
-file(GLOB SNOWBALL_SOURCES
- src_c/*.c
- runtime/api.c
- runtime/utilities.c
- libstemmer/libstemmer.c
-)
-
-add_library(stemmer ${SNOWBALL_SOURCES})
-
-install(
- TARGETS stemmer
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
-)
-if(NOT DISABLE_INSTALL_HEADERS)
- install(FILES include/libstemmer.h DESTINATION include)
-endif()
diff --git a/dev/vcpkg/ports/libstemmer/portfile.cmake
b/dev/vcpkg/ports/libstemmer/portfile.cmake
deleted file mode 100644
index 253027ad72..0000000000
--- a/dev/vcpkg/ports/libstemmer/portfile.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-string(SUBSTRING "${VERSION}" 5 -1 VERSION)
-
-vcpkg_download_distfile(ARCHIVE
- URLS "https://snowballstem.org/dist/libstemmer_c-${VERSION}.tar.gz";
- FILENAME "libstemmer_c-${VERSION}.tar.gz"
- SHA512
a61a06a046a6a5e9ada12310653c71afb27b5833fa9e21992ba4bdf615255de991352186a8736d0156ed754248a0ffb7b7712e8d5ea16f75174d1c8ddd37ba4a
-)
-
-vcpkg_extract_source_archive(
- SOURCE_PATH
- ARCHIVE "${ARCHIVE}"
-)
-
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION
"${SOURCE_PATH}")
-
-vcpkg_cmake_configure(
- SOURCE_PATH "${SOURCE_PATH}"
- OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
-)
-
-vcpkg_cmake_install()
-
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/dev/vcpkg/ports/libstemmer/vcpkg.json
b/dev/vcpkg/ports/libstemmer/vcpkg.json
deleted file mode 100644
index 03e8275d0b..0000000000
--- a/dev/vcpkg/ports/libstemmer/vcpkg.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "libstemmer",
- "version": "2021.2.2.0",
- "description": "Snowball is a small string processing language designed for
creating stemming algorithms for use in Information Retrieval",
- "homepage": "https://snowballstem.org/";,
- "dependencies": [
- {
- "name": "vcpkg-cmake",
- "host": true
- }
- ]
-}
diff --git a/dev/vcpkg/ports/simdjson/portfile.cmake
b/dev/vcpkg/ports/simdjson/portfile.cmake
index 41bf1c7091..6253089100 100644
--- a/dev/vcpkg/ports/simdjson/portfile.cmake
+++ b/dev/vcpkg/ports/simdjson/portfile.cmake
@@ -8,7 +8,7 @@ vcpkg_from_github(
HEAD_REF
master
SHA512
-
893ce0cb380b1418438f5910262325031f8071c4577589a491713f91c980964b4105c1e1aa7f2b9373deed40ecf6b48fe48a1aa243151e424f138f5418e4821c
+
a7e683625fa7e17cfe39cf3915b13fa34c589a8bcace51a9a8a98948f4cbdb1fd4346a273a44d934aced4aad1da7bc695b3b4f9fea078ae4bdf2b48234e99de3
PATCHES
add-definition.patch)
diff --git a/dev/vcpkg/ports/simdjson/vcpkg.json
b/dev/vcpkg/ports/simdjson/vcpkg.json
index 2b74be554c..b7da2b0ab4 100644
--- a/dev/vcpkg/ports/simdjson/vcpkg.json
+++ b/dev/vcpkg/ports/simdjson/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "simdjson",
- "version": "3.9.3",
+ "version": "4.1.0",
"description": "An extremely fast JSON library that can parse gigabytes of
JSON per second",
"homepage": "https://simdjson.org/";,
"license": "Apache-2.0",
diff --git a/dev/vcpkg/vcpkg.json b/dev/vcpkg/vcpkg.json
index 29d3c31cfd..f1f25b32f8 100644
--- a/dev/vcpkg/vcpkg.json
+++ b/dev/vcpkg/vcpkg.json
@@ -13,8 +13,6 @@
"double-conversion",
"bzip2",
"curl",
- "libxml2",
- "libuuid",
"lzo",
"re2",
"gflags",
@@ -52,7 +50,8 @@
"icu",
"thrift",
"libstemmer",
- "geos"
+ "geos",
+ "grpc"
]
},
"velox-s3": {
@@ -115,6 +114,7 @@
{ "name": "re2", "version": "2023-07-01"},
{ "name": "glog", "version": "0.6.0"},
{ "name": "gflags", "version": "2.2.2"},
- { "name": "azure-identity-cpp", "version": "1.11.0"}
+ { "name": "azure-identity-cpp", "version": "1.11.0"},
+ { "name": "grpc", "version": "1.51.1"}
]
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
