Skip to content

Commit

Permalink
ARROW-18361: [CI][Conan] Merge upstream changes (apache#14671)
Browse files Browse the repository at this point in the history
Updated: conan-io/conan-center-index#14111

Authored-by: Sutou Kouhei <kou@clear-code.com>
Signed-off-by: Sutou Kouhei <kou@clear-code.com>
  • Loading branch information
kou authored Nov 25, 2022
1 parent 8a93741 commit c0b311e
Show file tree
Hide file tree
Showing 32 changed files with 2,301 additions and 1,723 deletions.
113 changes: 61 additions & 52 deletions ci/conan/all/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
# SOFTWARE.

sources:
"10.0.0":
url: "https://github.com/apache/arrow/archive/apache-arrow-10.0.0.tar.gz"
sha256: "2852b21f93ee84185a9d838809c9a9c41bf6deca741bed1744e0fdba6cc19e3f"
"8.0.1":
url: "https://github.com/apache/arrow/archive/apache-arrow-8.0.1.tar.gz"
sha256: "e4c86329be769f2c8778aacc8d6220a9a13c90d59d4988f9349d51299dacbd11"
Expand All @@ -37,60 +40,66 @@ sources:
url: "https://github.com/apache/arrow/archive/apache-arrow-1.0.0.tar.gz"
sha256: "08fbd4c633c08939850d619ca0224c75d7a0526467c721c0838b8aa7efccb270"
patches:
"10.0.0":
- patch_file: "patches/10.0.0-0001-mallctl-takes-size_t.patch"
patch_description: "use size_t instead of ssize_t"
patch_type: "backport"
- patch_file: "patches/10.0.0-0002-fix-cmake.patch"
patch_description: "use cci package"
patch_type: "conan"
"8.0.1":
- base_path: "source_subfolder"
patch_file: "patches/8.0.0-0001-cmake.patch"
- base_path: "source_subfolder"
patch_file: "patches/8.0.0-0002-jemalloc.patch"
- base_path: "source_subfolder"
patch_file: "patches/8.0.0-0003-mallctl-takes-size_t.patch"
- base_path: "source_subfolder"
patch_file: "patches/8.0.0-0004-use-find-package.patch"
- base_path: "source_subfolder"
patch_file: "patches/8.0.0-0005-install-utils.patch"
- patch_file: "patches/8.0.0-0003-mallctl-takes-size_t.patch"
patch_description: "use size_t instead of ssize_t"
patch_type: "backport"
- patch_file: "patches/8.0.0-0005-install-utils.patch"
patch_description: "enable utilis installation"
patch_type: "conan"
- patch_file: "patches/8.0.0-0006-fix-cmake.patch"
patch_description: "use cci package"
patch_type: "conan"
"8.0.0":
- base_path: "source_subfolder"
patch_file: "patches/8.0.0-0001-cmake.patch"
- base_path: "source_subfolder"
patch_file: "patches/8.0.0-0002-jemalloc.patch"
- base_path: "source_subfolder"
patch_file: "patches/8.0.0-0003-mallctl-takes-size_t.patch"
- base_path: "source_subfolder"
patch_file: "patches/8.0.0-0004-use-find-package.patch"
- base_path: "source_subfolder"
patch_file: "patches/8.0.0-0005-install-utils.patch"
- patch_file: "patches/8.0.0-0003-mallctl-takes-size_t.patch"
patch_description: "use size_t instead of ssize_t"
patch_type: "backport"
- patch_file: "patches/8.0.0-0005-install-utils.patch"
patch_description: "enable utilis installation"
patch_type: "conan"
- patch_file: "patches/8.0.0-0006-fix-cmake.patch"
patch_description: "use cci package"
patch_type: "conan"
"7.0.0":
- base_path: "source_subfolder"
patch_file: "patches/7.0.0-0001-cmake.patch"
- base_path: "source_subfolder"
patch_file: "patches/7.0.0-0002-jemalloc.patch"
- base_path: "source_subfolder"
patch_file: "patches/7.0.0-0003-mallctl-takes-size_t.patch"
- base_path: "source_subfolder"
patch_file: "patches/7.0.0-0005-use-find-package.patch"
- base_path: "source_subfolder"
patch_file: "patches/7.0.0-0006-install-utils.patch"
- patch_file: "patches/7.0.0-0003-mallctl-takes-size_t.patch"
patch_description: "use size_t instead of ssize_t"
patch_type: "backport"
- patch_file: "patches/7.0.0-0006-install-utils.patch"
patch_description: "enable utilis installation"
patch_type: "conan"
- patch_file: "patches/7.0.0-0007-fix-cmake.patch"
patch_description: "use cci package"
patch_type: "conan"
"2.0.0":
- base_path: "source_subfolder"
patch_file: "patches/2.0.0-0001-cmake.patch"
- base_path: "source_subfolder"
patch_file: "patches/2.0.0-0002-jemalloc.patch"
- base_path: "source_subfolder"
patch_file: "patches/2.0.0-0003-fix-shared-msvc.patch"
- base_path: "source_subfolder"
patch_file: "patches/1.0.0-0004-mallctl-takes-size_t.patch"
- base_path: "source_subfolder"
patch_file: "patches/2.0.0-0005-gandiva-engine.patch"
- base_path: "source_subfolder"
patch_file: "patches/2.0.0-0006-gandiva-llvm-re2.patch"
- base_path: "source_subfolder"
patch_file: "patches/2.0.0-0007-fix-protoc-cmake.patch"
- patch_file: "patches/2.0.0-0003-fix-shared-msvc.patch"
patch_description: "make shared enabled in msvc"
patch_type: "backport"
- patch_file: "patches/1.0.0-0004-mallctl-takes-size_t.patch"
patch_description: "use size_t instead of ssize_t"
patch_type: "backport"
- patch_file: "patches/2.0.0-0005-gandiva-engine.patch"
patch_description: "fix grandiva compilation error"
patch_type: "backport"
- patch_file: "patches/2.0.0-0008-fix-cmake.patch"
patch_description: "use cci package"
patch_type: "conan"
"1.0.0":
- base_path: "source_subfolder"
patch_file: "patches/1.0.0-0001-cmake.patch"
- base_path: "source_subfolder"
patch_file: "patches/1.0.0-0002-jemalloc.patch"
- base_path: "source_subfolder"
patch_file: "patches/1.0.0-0003-fix-shared-msvc.patch"
- base_path: "source_subfolder"
patch_file: "patches/1.0.0-0004-mallctl-takes-size_t.patch"
- patch_file: "patches/1.0.0-0003-fix-shared-msvc.patch"
patch_description: "make shared enabled in msvc"
patch_type: "backport"
- patch_file: "patches/1.0.0-0004-mallctl-takes-size_t.patch"
patch_description: "use size_t instead of ssize_t"
patch_type: "backport"
- patch_file: "patches/1.0.0-0005-fix-make12-namespace.patch"
patch_description: "fix ambiguous `make12` function between std and date"
patch_type: "backport"
- patch_file: "patches/1.0.0-0006-fix-cmake.patch"
patch_description: "use cci package"
patch_type: "conan"
Loading

0 comments on commit c0b311e

Please sign in to comment.