Skip to content

Commit

Permalink
(conan-io#25375) duckdb: add version 1.1.1, remove older versions
Browse files Browse the repository at this point in the history
  • Loading branch information
toge authored Sep 26, 2024
1 parent 80371c3 commit 01358f0
Show file tree
Hide file tree
Showing 11 changed files with 163 additions and 494 deletions.
60 changes: 10 additions & 50 deletions recipes/duckdb/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"1.1.1":
url: "https://github.com/duckdb/duckdb/archive/refs/tags/v1.1.1.tar.gz"
sha256: "a764cef80287ccfd8555884d8facbe962154e7c747043c0842cd07873b4d6752"
"1.1.0":
url: "https://github.com/duckdb/duckdb/archive/refs/tags/v1.1.0.tar.gz"
sha256: "d9be2c6d3a5ebe2b3d33044fb2cb535bb0bd972a27ae38c4de5e1b4caa4bf68d"
Expand All @@ -17,25 +20,14 @@ sources:
"0.9.0":
url: "https://github.com/duckdb/duckdb/archive/refs/tags/v0.9.0.tar.gz"
sha256: "3dbf3326a831bf0797591572440e81a3d6d668f8e33a25ce04efae19afc3a23d"
"0.8.1":
url: "https://github.com/duckdb/duckdb/archive/refs/tags/v0.8.1.tar.gz"
sha256: "a0674f7e320dc7ebcf51990d7fc1c0e7f7b2c335c08f5953702b5285e6c30694"
"0.8.0":
url: "https://github.com/duckdb/duckdb/archive/refs/tags/v0.8.0.tar.gz"
sha256: "df3b8e0b72bce38914f0fb1cd02235d8b616df9209beb14beb06bfbcaaf2e97f"
"0.7.1":
url: "https://github.com/duckdb/duckdb/archive/refs/tags/v0.7.1.tar.gz"
sha256: "67f840f861e5ffbe137d65a8543642d016f900b89dd035492d562ad11acf0e1e"
"0.6.1":
url: "https://github.com/duckdb/duckdb/archive/refs/tags/v0.6.1.tar.gz"
sha256: "ea9bba89ae3e461f3fc9f83911b2f3b6c386c23463bcf7b1ed6bb4cc13e822a4"
"0.6.0":
url: "https://github.com/duckdb/duckdb/archive/refs/tags/v0.6.0.tar.gz"
sha256: "700b09114f8b99892a9d19ba21ca962ae65d1ea8085622418a2fa50ff915b244"
"0.5.1":
url: "https://github.com/duckdb/duckdb/archive/refs/tags/v0.5.1.tar.gz"
sha256: "3dab7ba0d0f8d024d3c73fd3d4fb8834203c31d7b0ddb1e8539ee266e11b0e9b"
patches:
"1.1.1":
- patch_file: "patches/1.1.1-0001-fix-cmake.patch"
patch_description: "install static of shared library, add installation for odbc extention"
patch_type: "portability"
- patch_file: "patches/1.1.1-0002-msvc-bicobj.patch"
patch_description: "add /bigobj flag"
patch_type: "portability"
"1.1.0":
- patch_file: "patches/1.1.0-0001-fix-cmake.patch"
patch_description: "install static of shared library, add installation for odbc extention"
Expand Down Expand Up @@ -72,35 +64,3 @@ patches:
- patch_file: "patches/0.9.0-0001-fix-cmake.patch"
patch_description: "install static of shared library, add installation for odbc extention"
patch_type: "portability"
"0.8.1":
- patch_file: "patches/0.8.1-0001-fix-cmake.patch"
patch_description: "install static of shared library, add installation for odbc extention"
patch_type: "portability"
"0.8.0":
- patch_file: "patches/0.8.0-0001-fix-cmake.patch"
patch_description: "install static of shared library, add installation for odbc extention"
patch_type: "portability"
"0.7.1":
- patch_file: "patches/0.7.0-0001-fix-cmake.patch"
patch_description: "install static of shared library, add installation for odbc extention"
patch_type: "portability"
"0.6.1":
- patch_file: "patches/0.6.0-0001-fix-cmake.patch"
patch_description: "install static of shared library, add installation for odbc extention"
patch_type: "portability"
- patch_file: "patches/0.6.0-0002-include-stdlib.patch"
patch_description: "include stdlib for abort function"
patch_type: "portability"
patch_source: "https://github.com/duckdb/duckdb/commit/50b0bd07a6c22d17c4453632fce3b3d3c872663e"
"0.6.0":
- patch_file: "patches/0.6.0-0001-fix-cmake.patch"
patch_description: "install static of shared library, add installation for odbc extention"
patch_type: "portability"
- patch_file: "patches/0.6.0-0002-include-stdlib.patch"
patch_description: "include stdlib for abort function"
patch_type: "portability"
patch_source: "https://github.com/duckdb/duckdb/commit/50b0bd07a6c22d17c4453632fce3b3d3c872663e"
"0.5.1":
- patch_file: "patches/0.5.1-0001-fix-cmake.patch"
patch_description: "install static of shared library, add installation for odbc extention"
patch_type: "portability"
74 changes: 28 additions & 46 deletions recipes/duckdb/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ class DuckdbConan(ConanFile):
"fPIC": [True, False],
"with_autocomplete": [True, False],
"with_icu": [True, False],
"with_parquet": [True, False],
"with_tpch": [True, False],
"with_tpcds": [True, False],
"with_fts": [True, False],
Expand All @@ -46,7 +45,6 @@ class DuckdbConan(ConanFile):
"fPIC": True,
"with_autocomplete": False,
"with_icu": False,
"with_parquet": False,
"with_tpch": False,
"with_tpcds": False,
"with_fts": False,
Expand Down Expand Up @@ -74,8 +72,6 @@ def export_sources(self):
def config_options(self):
if self.settings.os == "Windows":
del self.options.fPIC
if Version(self.version) >= "0.9.0":
del self.options.with_parquet
if Version(self.version) >= "1.1.0":
del self.options.with_odbc

Expand Down Expand Up @@ -111,46 +107,33 @@ def generate(self):
tc.variables["DUCKDB_PATCH_VERSION"] = Version(self.version).patch
tc.variables["DUCKDB_DEV_ITERATION"] = 0
tc.variables["OVERRIDE_GIT_DESCRIBE"] = f"v{self.version}"
if "with_parquet" in self.options:
tc.variables["BUILD_PARQUET_EXTENSION"] = self.options.with_parquet

if Version(self.version) >= "0.9.0":
build_extensions = ""
if self.options.with_icu:
build_extensions += ";icu"
if self.options.with_autocomplete:
build_extensions += ";autocomplete"
if self.options.with_tpch:
build_extensions += ";tpch"
if self.options.with_tpcds:
build_extensions += ";tpcds"
if self.options.with_fts:
build_extensions += ";fts"
if self.options.with_visualizer:
build_extensions += ";visualizer"
if self.options.with_httpfs:
build_extensions += ";httpfs"
if self.options.with_json:
build_extensions += ";json"
if self.options.with_excel:
build_extensions += ";excel"
if self.options.with_inet:
build_extensions += ";inet"
if self.options.with_sqlsmith:
build_extensions += ";sqlsmith"
tc.variables["BUILD_EXTENSIONS"] = build_extensions
else:
tc.variables["BUILD_ICU_EXTENSION"] = self.options.with_icu
tc.variables["BUILD_TPCH_EXTENSION"] = self.options.with_tpch
tc.variables["BUILD_TPCDS_EXTENSION"] = self.options.with_tpcds
tc.variables["BUILD_FTS_EXTENSION"] = self.options.with_fts
tc.variables["BUILD_HTTPFS_EXTENSION"] = self.options.with_httpfs
tc.variables["BUILD_VISUALIZER_EXTENSION"] = self.options.with_visualizer
tc.variables["BUILD_JSON_EXTENSION"] = self.options.with_json
tc.variables["BUILD_EXCEL_EXTENSION"] = self.options.with_excel
tc.variables["BUILD_SQLSMITH_EXTENSION"] = self.options.with_sqlsmith

if "self.options" in self.options:
build_extensions = ""
if self.options.with_icu:
build_extensions += ";icu"
if self.options.with_autocomplete:
build_extensions += ";autocomplete"
if self.options.with_tpch:
build_extensions += ";tpch"
if self.options.with_tpcds:
build_extensions += ";tpcds"
if self.options.with_fts:
build_extensions += ";fts"
if self.options.with_visualizer:
build_extensions += ";visualizer"
if self.options.with_httpfs:
build_extensions += ";httpfs"
if self.options.with_json:
build_extensions += ";json"
if self.options.with_excel:
build_extensions += ";excel"
if self.options.with_inet:
build_extensions += ";inet"
if self.options.with_sqlsmith:
build_extensions += ";sqlsmith"
tc.variables["BUILD_EXTENSIONS"] = build_extensions

if "with_odbc" in self.options:
tc.variables["BUILD_ODBC_DRIVER"] = self.options.with_odbc
tc.variables["FORCE_QUERY_LOG"] = self.options.with_query_log
tc.variables["BUILD_SHELL"] = self.options.with_shell
Expand Down Expand Up @@ -214,8 +197,7 @@ def package_info(self):
"duckdb_fastpforlib",
"duckdb_mbedtls",
]
if Version(self.version) >= "0.6.0":
self.cpp_info.libs.append("duckdb_fsst")
self.cpp_info.libs.append("duckdb_fsst")
if Version(self.version) >= "0.10.0":
self.cpp_info.libs.append("duckdb_skiplistlib")
if Version(self.version) >= "0.10.3":
Expand All @@ -237,7 +219,7 @@ def package_info(self):
self.cpp_info.libs.append("visualizer_extension")
if self.options.with_httpfs:
self.cpp_info.libs.append("httpfs_extension")
if (Version(self.version) >= "0.6.0" and self.settings.os == "Linux" and
if (self.settings.os == "Linux" and
(Version(self.version) < "0.10.1" or self.settings.arch == "x86_64")):
self.cpp_info.libs.append("jemalloc_extension")
if self.options.with_json:
Expand Down
82 changes: 0 additions & 82 deletions recipes/duckdb/all/patches/0.5.1-0001-fix-cmake.patch

This file was deleted.

58 changes: 0 additions & 58 deletions recipes/duckdb/all/patches/0.6.0-0001-fix-cmake.patch

This file was deleted.

12 changes: 0 additions & 12 deletions recipes/duckdb/all/patches/0.6.0-0002-include-stdlib.patch

This file was deleted.

Loading

0 comments on commit 01358f0

Please sign in to comment.