Skip to content

Commit 9616cbe

Browse files
committed
move date/*:use_system_tz_db to conan profile
1 parent 2e849f7 commit 9616cbe

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

conan_patches/onnxruntime/recipe.diff

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,6 @@ diff --git a/recipes/onnxruntime/all/conanfile.py b/recipes/onnxruntime/all/cona
22
index 0757ecdc0..bb8cca8bf 100644
33
--- a/recipes/onnxruntime/all/conanfile.py
44
+++ b/recipes/onnxruntime/all/conanfile.py
5-
@@ -34,6 +34,11 @@ class OnnxRuntimeConan(ConanFile):
6-
"fPIC": True,
7-
"with_xnnpack": False,
8-
"with_cuda": False,
9-
+ # Prevents libcurl dependency (fails to build due to system zlib)
10-
+ # NOTE:
11-
+ # 'use_system_tz_db' is specific to date/3.0.1 (version pinned by onnxruntime/1.18.1).
12-
+ # Newer date recipes would need the tz_db=system option instead.
13-
+ "date/*:use_system_tz_db": True,
14-
}
15-
short_paths = True
16-
175
@@ -47,7 +52,7 @@ class OnnxRuntimeConan(ConanFile):
186
def _compilers_minimum_version(self):
197
return {

conan_profiles/base/common

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,3 +225,8 @@ pcre2/*:build_pcre2grep=False
225225
sqlite3/*:build_executable=False
226226
opusfile/*:http=False
227227
zstd/*:build_programs=False
228+
229+
# Prevents libcurl dependency (fails to build due to system zlib)
230+
# NOTE: use_system_tz_db is specific to date/3.0.1
231+
# Newer date recipes would need the tz_db=system option instead.
232+
date/*:use_system_tz_db=True

0 commit comments

Comments
 (0)