ARROW-17251: [CI][Conan] Enable Flight (#13761)

This also applies upstream changes. Authored-by: Sutou Kouhei <kou@clear-code.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
apache · Aug 6, 2022 · 0ffcc59 · 0ffcc59
1 parent 6d575b6
commit 0ffcc59
Show file tree

Hide file tree

Showing 15 changed files with 898 additions and 704 deletions.
diff --git a/ci/conan/all/conandata.yml b/ci/conan/all/conandata.yml
@@ -21,6 +21,12 @@
 # SOFTWARE.
 
 sources:
+  "8.0.1":
+    url: "https://github.com/apache/arrow/archive/apache-arrow-8.0.1.tar.gz"
+    sha256: "e4c86329be769f2c8778aacc8d6220a9a13c90d59d4988f9349d51299dacbd11"
+  "8.0.0":
+    url: "https://github.com/apache/arrow/archive/apache-arrow-8.0.0.tar.gz"
+    sha256: "19ece12de48e51ce4287d2dee00dc358fbc5ff02f41629d16076f77b8579e272"
   "7.0.0":
     url: "https://github.com/apache/arrow/archive/apache-arrow-7.0.0.tar.gz"
     sha256: "57e13c62f27b710e1de54fd30faed612aefa22aa41fa2c0c3bacd204dd18a8f3"
@@ -31,17 +37,39 @@ sources:
     url: "https://github.com/apache/arrow/archive/apache-arrow-1.0.0.tar.gz"
     sha256: "08fbd4c633c08939850d619ca0224c75d7a0526467c721c0838b8aa7efccb270"
 patches:
+  "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"
+  "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"
   "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-0004-remove-find-modules.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"
   "2.0.0":
     - base_path: "source_subfolder"
       patch_file: "patches/2.0.0-0001-cmake.patch"

diff --git a/ci/conan/all/conanfile.py b/ci/conan/all/conanfile.py