Skip to content

[duckdb] fix icu build #44410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 3 commits into from
Mar 19, 2025
Merged

[duckdb] fix icu build #44410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bee3307
[duckdb] fix icu feature
autoantwort Mar 16, 2025
3dd6ab3
add test port
autoantwort Mar 16, 2025
cee4037
update patch
autoantwort Mar 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ports/duckdb/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ vcpkg_from_github(
REPO duckdb/duckdb
REF v${VERSION}
SHA512 7e2ec4f6d6be6d500b148bd845cc51fe8985190eed8ab6f6fe79012c216cad5592ab3329e2df6b091abcc6ea8937d66f47272baead798c7d711e5d73aa9ffaa7
HEAD_REF master
HEAD_REF main
PATCHES
bigobj.patch
unvendor_icu_and_find_dependency.patch # https://github.com/duckdb/duckdb/pull/16176 + https://github.com/duckdb/duckdb/pull/16197
httpfs.patch
t-external-icu.patch # from https://github.com/duckdb/duckdb/pull/16676
)

# Remove vendored dependencies which are not properly namespaced
Expand Down
35 changes: 35 additions & 0 deletions ports/duckdb/t-external-icu.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
diff --git a/DuckDBConfig.cmake.in b/DuckDBConfig.cmake.in
index 2e5270e..7c5ce31 100644
--- a/DuckDBConfig.cmake.in
+++ b/DuckDBConfig.cmake.in
@@ -7,7 +7,7 @@
include(CMakeFindDependencyMacro)
find_dependency(Threads)
if(NOT @WITH_INTERNAL_ICU@)
- find_dependency(ICU COMPONENTS i18n uc)
+ find_dependency(ICU COMPONENTS i18n uc data)
endif()

# Compute paths
diff --git a/extension/icu/CMakeLists.txt b/extension/icu/CMakeLists.txt
index b5585e4..e3ae9cf 100644
--- a/extension/icu/CMakeLists.txt
+++ b/extension/icu/CMakeLists.txt
@@ -30,12 +30,15 @@ set(ICU_EXTENSION_FILES
build_static_extension(icu ${ICU_EXTENSION_FILES})
link_threads(icu_extension)
if(NOT WITH_INTERNAL_ICU)
- find_package(ICU COMPONENTS i18n uc REQUIRED)
- target_link_libraries(icu_extension ICU::i18n ICU::uc)
+ find_package(ICU COMPONENTS i18n uc data REQUIRED)
+ target_link_libraries(icu_extension ICU::i18n ICU::uc ICU::data)
endif()
disable_target_warnings(icu_extension)
set(PARAMETERS "-no-warnings")
build_loadable_extension(icu ${PARAMETERS} ${ICU_EXTENSION_FILES})
+if(NOT WITH_INTERNAL_ICU)
+ target_link_libraries(icu_loadable_extension ICU::i18n ICU::uc ICU::data)
+endif()
install(
TARGETS icu_extension
EXPORT "${DUCKDB_EXPORT_SET}"
1 change: 1 addition & 0 deletions ports/duckdb/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "duckdb",
"version": "1.2.1",
"port-version": 1,
"description": "High-performance in-process analytical database system",
"homepage": "https://duckdb.org",
"license": "MIT",
Expand Down
1 change: 1 addition & 0 deletions scripts/test_ports/vcpkg-ci-duckdb/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
14 changes: 14 additions & 0 deletions scripts/test_ports/vcpkg-ci-duckdb/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "vcpkg-ci-duckdb",
"version": "0.0.1",
"description": "Test the icu feature",
"license": "BSD-3-Clause",
"dependencies": [
{
"name": "duckdb",
"features": [
"icu"
]
}
]
}
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2434,7 +2434,7 @@
},
"duckdb": {
"baseline": "1.2.1",
"port-version": 0
"port-version": 1
},
"duckx": {
"baseline": "1.2.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/d-/duckdb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "95e99c85866fb18cb5494092ea09a224200e7a9e",
"version": "1.2.1",
"port-version": 1
},
{
"git-tree": "213b32d9a3a2f7ef1676b475d18efa7d20879888",
"version": "1.2.1",
Expand Down