Update nanoarrow to 0.9.0 (#53249)

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
Dewey Dunnington 2026-08-08 02:02:59 -04:00 committed by GitHub
parent 98e88aa0cc
commit dfcd149f4e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 22 additions and 24 deletions

View File

@ -1,17 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d80849..c414865 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,8 +229,10 @@ if(NANOARROW_IPC)
set(NANOARROW_FLATCC_INCLUDE_DIR "${NANOARROW_FLATCC_ROOT_DIR}/include")
add_library(flatccrt STATIC IMPORTED)
set_target_properties(flatccrt
- PROPERTIES IMPORTED_LOCATION
- "${NANOARROW_FLATCC_ROOT_DIR}/lib/libflatccrt.a"
+ PROPERTIES IMPORTED_LOCATION_DEBUG
+ "${NANOARROW_FLATCC_ROOT_DIR}/debug/lib/${CMAKE_STATIC_LIBRARY_PREFIX}flatccrt_d${CMAKE_STATIC_LIBRARY_SUFFIX}"
+ IMPORTED_LOCATION_RELEASE
+ "${NANOARROW_FLATCC_ROOT_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}flatccrt${CMAKE_STATIC_LIBRARY_SUFFIX}"
INTERFACE_INCLUDE_DIRECTORIES
"${NANOARROW_FLATCC_INCLUDE_DIR}")
endif()

View File

@ -2,13 +2,12 @@
vcpkg_download_distfile(ARCHIVE
URLS "https://archive.apache.org/dist/arrow/apache-arrow-nanoarrow-${VERSION}/apache-arrow-nanoarrow-${VERSION}.tar.gz"
FILENAME "apache-arrow-nanoarrow-${VERSION}.tar.gz"
SHA512 98f9f4c8dada0175e39e02d2baa01d0f63ad94636925cd289cbffa423de26bf0ede437aaa1ec10ff91e7d375e72cfddd950d040602520ab7891ab4c6337ce4f7
SHA512 2fbdfe3274da9dcba5e3215ba0a7ff66da9f65395d1800841f0dc9a6bbc00b8cc224f900bcb946c91969b3c6e79d132ad5077c9a537f861502c4763dbffb33b8
)
vcpkg_extract_source_archive(
SOURCE_PATH
ARCHIVE "${ARCHIVE}"
PATCHES fix-flatccrt-name.patch
)
file(REMOVE_RECURSE "${SOURCE_PATH}/thirdparty")
@ -37,7 +36,19 @@ vcpkg_cmake_config_fixup(
DO_NOT_DELETE_PARENT_CONFIG_PATH
)
# Fix bare "flatccrt" in INTERFACE_LINK_LIBRARIES - Windows needs the full path
# Tracked upstream at https://github.com/apache/arrow-nanoarrow/issues/922
if ("ipc" IN_LIST FEATURES AND VCPKG_TARGET_IS_WINDOWS)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/nanoarrow/nanoarrow-targets.cmake"
[[\$<LINK_ONLY:flatccrt>]]
[[\$<LINK_ONLY:${_IMPORT_PREFIX}/lib/flatccrt.lib>]]
)
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" "${CURRENT_PACKAGES_DIR}/lib/cmake")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
vcpkg_install_copyright(FILE_LIST
"${SOURCE_PATH}/LICENSE.txt"
"${SOURCE_PATH}/NOTICE.txt"
)

View File

@ -1,7 +1,6 @@
{
"name": "nanoarrow",
"version": "0.8.0",
"port-version": 2,
"version": "0.9.0",
"description": "Helpers for Arrow C Data & Arrow C Stream interfaces",
"homepage": "https://arrow.apache.org/nanoarrow",
"license": "Apache-2.0",

View File

@ -6941,8 +6941,8 @@
"port-version": 2
},
"nanoarrow": {
"baseline": "0.8.0",
"port-version": 2
"baseline": "0.9.0",
"port-version": 0
},
"nanobench": {
"baseline": "4.3.11",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a97555b144ae542b7f08bd233de8270ab2e3cb7d",
"version": "0.9.0",
"port-version": 0
},
{
"git-tree": "d377a0f822e3932778415133cff512d00c74b17a",
"version": "0.8.0",