From 7a6163541b4ef1652f429a761df7ccc9b5385989 Mon Sep 17 00:00:00 2001 From: toge Date: Fri, 8 Nov 2024 01:41:56 +0900 Subject: [PATCH] duckdb: add version 1.1.3 (#25839) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * duckdb: add version 1.1.3 * Trigger build for PR-25839 * Remove test_v1 --------- Co-authored-by: Uilian Ries Co-authored-by: Abril Rincón Blanco --- recipes/duckdb/all/conandata.yml | 10 ++++++++++ .../duckdb/all/test_v1_package/CMakeLists.txt | 8 -------- .../duckdb/all/test_v1_package/conanfile.py | 18 ------------------ recipes/duckdb/config.yml | 2 ++ 4 files changed, 12 insertions(+), 26 deletions(-) delete mode 100644 recipes/duckdb/all/test_v1_package/CMakeLists.txt delete mode 100644 recipes/duckdb/all/test_v1_package/conanfile.py diff --git a/recipes/duckdb/all/conandata.yml b/recipes/duckdb/all/conandata.yml index c06279c4c348e..459430601e0ca 100644 --- a/recipes/duckdb/all/conandata.yml +++ b/recipes/duckdb/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.1.3": + url: "https://github.com/duckdb/duckdb/archive/refs/tags/v1.1.2.tar.gz" + sha256: "a3319a64c390ed0454c869b2e4fc0af2413cd49f55cd0f1400aaed9069cdbc4c" "1.1.2": url: "https://github.com/duckdb/duckdb/archive/refs/tags/v1.1.2.tar.gz" sha256: "a3319a64c390ed0454c869b2e4fc0af2413cd49f55cd0f1400aaed9069cdbc4c" @@ -24,6 +27,13 @@ sources: url: "https://github.com/duckdb/duckdb/archive/refs/tags/v0.9.0.tar.gz" sha256: "3dbf3326a831bf0797591572440e81a3d6d668f8e33a25ce04efae19afc3a23d" patches: + "1.1.3": + - 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.2": - patch_file: "patches/1.1.1-0001-fix-cmake.patch" patch_description: "install static of shared library, add installation for odbc extention" diff --git a/recipes/duckdb/all/test_v1_package/CMakeLists.txt b/recipes/duckdb/all/test_v1_package/CMakeLists.txt deleted file mode 100644 index 925ecbe19e448..0000000000000 --- a/recipes/duckdb/all/test_v1_package/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(test_package) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS) - -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package/ - ${CMAKE_CURRENT_BINARY_DIR}/test_package/) diff --git a/recipes/duckdb/all/test_v1_package/conanfile.py b/recipes/duckdb/all/test_v1_package/conanfile.py deleted file mode 100644 index 5a05af3c2dfd2..0000000000000 --- a/recipes/duckdb/all/test_v1_package/conanfile.py +++ /dev/null @@ -1,18 +0,0 @@ -from conans import ConanFile, CMake -from conan.tools.build import cross_building -import os - - -class TestPackageV1Conan(ConanFile): - settings = "os", "arch", "compiler", "build_type" - generators = "cmake", "cmake_find_package_multi" - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def test(self): - if not cross_building(self): - bin_path = os.path.join("bin", "test_package") - self.run(bin_path, run_environment=True) diff --git a/recipes/duckdb/config.yml b/recipes/duckdb/config.yml index c2b4e851806f9..e49709a230ba5 100644 --- a/recipes/duckdb/config.yml +++ b/recipes/duckdb/config.yml @@ -1,4 +1,6 @@ versions: + "1.1.3": + folder: "all" "1.1.2": folder: "all" "1.1.1":