Remove unneeded bundled libxml2 build

Tom-Newton · Aug 10, 2023 · 0234d5a · 0234d5a
1 parent 6d6e5a9
commit 0234d5a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 68 deletions.
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -58,7 +58,6 @@ set(ARROW_THIRDPARTY_DEPENDENCIES
     gRPC
     GTest
     jemalloc
-    LibXml2
     LLVM
     lz4
     nlohmann_json
@@ -186,8 +185,6 @@ macro(build_dependency DEPENDENCY_NAME)
     build_gtest()
   elseif("${DEPENDENCY_NAME}" STREQUAL "jemalloc")
     build_jemalloc()
-  elseif("${DEPENDENCY_NAME}" STREQUAL "LibXml2")
-    build_libxml2()
   elseif("${DEPENDENCY_NAME}" STREQUAL "lz4")
     build_lz4()
   elseif("${DEPENDENCY_NAME}" STREQUAL "nlohmann_json")
@@ -379,7 +376,6 @@ endif()
 # Enable Azure
 if(ARROW_AZURE)
   set(ARROW_WITH_AZURE_SDK ON)
-  set(ARROW_WITH_LIBXML2 ON)
 endif()
 
 if(ARROW_JSON)
@@ -693,14 +689,6 @@ else()
   )
 endif()
 
-if(DEFINED ENV{ARROW_LIBXML2_URL})
-  set(LIBXML2_SOURCE_URL "$ENV{ARROW_LIBXML2_URL}")
-else()
-  set_urls(LIBXML2_SOURCE_URL
-           "https://github.com/GNOME/libxml2/archive/refs/tags/${ARROW_LIBXML2_BUILD_VERSION}.tar.gz"
-  )
-endif()
-
 if(DEFINED ENV{ARROW_LZ4_URL})
   set(LZ4_SOURCE_URL "$ENV{ARROW_LZ4_URL}")
 else()
@@ -5072,55 +5060,6 @@ endif()
 # ----------------------------------------------------------------------
 # Azure SDK and dependencies
 
-macro(build_libxml2)
-  message(STATUS "Building libxml2 from source")
-  set(LIBXML2_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/xml2_ep-install")
-  set(LIBXML2_INCLUDE_DIR "${LIBXML2_PREFIX}/include")
-
-  set(LIBXML2_CMAKE_ARGS
-      ${EP_COMMON_CMAKE_ARGS} 
-      "-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>" 
-      -DCMAKE_INSTALL_LIBDIR=lib
-      -DBUILD_TESTING=OFF
-      -DLIBXML2_WITH_ZLIB=OFF 
-      -DLIBXML2_WITH_PYTHON=OFF 
-      -DLIBXML2_WITH_LZMA=OFF 
-      -DLIBXML2_WITH_ICONV=OFF 
-      -DBUILD_SHARED_LIBS=OFF)
-
-  set(LIBXML2_STATIC_LIBRARY
-    "${LIBXML2_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}xml2${CMAKE_STATIC_LIBRARY_SUFFIX}"
-  )
-  set(LIBXML2_BUILD_BYPRODUCTS ${LIBXML2_STATIC_LIBRARY})
-
-  externalproject_add(libxml2_ep
-                      ${EP_LOG_OPTIONS}
-                      INSTALL_DIR ${LIBXML2_PREFIX}
-                      URL ${LIBXML2_SOURCE_URL}
-                      URL_HASH "SHA256=${ARROW_LIBXML2_BUILD_SHA256_CHECKSUM}"
-                      CMAKE_ARGS ${LIBXML2_CMAKE_ARGS}
-                      BUILD_BYPRODUCTS ${LIBXML2_BUILD_BYPRODUCTS})
-
-  # Work around https://gitlab.kitware.com/cmake/cmake/issues/15052
-  file(MAKE_DIRECTORY "${LIBXML2_INCLUDE_DIR}")
-  add_library(LibXml2::LibXml2 STATIC IMPORTED)
-  set_target_properties(LibXml2::LibXml2
-                        PROPERTIES IMPORTED_LOCATION ${LIBXML2_STATIC_LIBRARY}
-                                   INTERFACE_INCLUDE_DIRECTORIES
-                                   "${LIBXML2_INCLUDE_DIR}")
-  add_dependencies(LibXml2::LibXml2 libxml2_ep)
-  set(LIBXML2_VENDORED TRUE)
-endmacro()
-
-if(ARROW_WITH_LIBXML2)
-  message(STATUS "Building LibXml2 from source")
-  resolve_dependency(LibXml2)
-  message(STATUS "Resolved LibXml2")
-  get_target_property(LIBXML2_INCLUDE_DIR LibXml2::LibXml2
-                      INTERFACE_INCLUDE_DIRECTORIES)
-  message(STATUS "Found xml2 headers: ${LIBXML2_INCLUDE_DIR}")
-endif()
-
 macro(build_azuresdk)
   message(STATUS "Building Azure C++ SDK from source")
 
@@ -5132,10 +5071,6 @@ macro(build_azuresdk)
                         ${ARROW_OPENSSL_REQUIRED_VERSION})
   endif()
 
-  if(LIBXML2_VENDORED)
-    add_dependencies(azure_sdk_dependencies libxml2_ep)
-  endif()
-
   set(AZURESDK_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/azuresdk_ep-install")
   set(AZURESDK_INCLUDE_DIR "${AZURESDK_PREFIX}/include")
   set(AZURESDK_LIB_DIR "lib")

diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt
@@ -113,8 +113,6 @@ ARROW_UCX_BUILD_VERSION=1.12.1
 ARROW_UCX_BUILD_SHA256_CHECKSUM=9bef31aed0e28bf1973d28d74d9ac4f8926c43ca3b7010bd22a084e164e31b71
 ARROW_UTF8PROC_BUILD_VERSION=v2.7.0
 ARROW_UTF8PROC_BUILD_SHA256_CHECKSUM=4bb121e297293c0fd55f08f83afab6d35d48f0af4ecc07523ad8ec99aa2b12a1
-ARROW_LIBXML2_BUILD_VERSION=v2.11.4
-ARROW_LIBXML2_BUILD_SHA256_CHECKSUM=2fd59eccfe277f7b7dec8836254acbebd24af33857a018dd64ddcf92d88d7f7e
 ARROW_XSIMD_BUILD_VERSION=9.0.1
 ARROW_XSIMD_BUILD_SHA256_CHECKSUM=b1bb5f92167fd3a4f25749db0be7e61ed37e0a5d943490f3accdcd2cd2918cc0
 ARROW_ZLIB_BUILD_VERSION=1.2.13
@@ -158,7 +156,6 @@ DEPENDENCIES=(
   "ARROW_LZ4_URL lz4-${ARROW_LZ4_BUILD_VERSION}.tar.gz https://github.com/lz4/lz4/archive/${ARROW_LZ4_BUILD_VERSION}.tar.gz"
   "ARROW_MIMALLOC_URL mimalloc-${ARROW_MIMALLOC_BUILD_VERSION}.tar.gz https://github.com/microsoft/mimalloc/archive/${ARROW_MIMALLOC_BUILD_VERSION}.tar.gz"
   "ARROW_NLOHMANN_JSON_URL nlohmann-json-${ARROW_NLOHMANN_JSON_BUILD_VERSION}.tar.gz https://github.com/nlohmann/json/archive/refs/tags/${ARROW_NLOHMANN_JSON_BUILD_VERSION}.tar.gz"
-  "ARROW_LIBXML2_URL xml2-${ARROW_LIBXML2_BUILD_VERSION}.tar.gz https://github.com/GNOME/libxml2/archive/refs/tags/${ARROW_LIBXML2_BUILD_VERSION}.tar.gz"
   "ARROW_OPENTELEMETRY_URL opentelemetry-cpp-${ARROW_OPENTELEMETRY_BUILD_VERSION}.tar.gz https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/${ARROW_OPENTELEMETRY_BUILD_VERSION}.tar.gz"
   "ARROW_OPENTELEMETRY_PROTO_URL opentelemetry-proto-${ARROW_OPENTELEMETRY_PROTO_BUILD_VERSION}.tar.gz https://github.com/open-telemetry/opentelemetry-proto/archive/refs/tags/${ARROW_OPENTELEMETRY_PROTO_BUILD_VERSION}.tar.gz"
   "ARROW_ORC_URL orc-${ARROW_ORC_BUILD_VERSION}.tar.gz https://archive.apache.org/dist/orc/orc-${ARROW_ORC_BUILD_VERSION}/orc-${ARROW_ORC_BUILD_VERSION}.tar.gz"