apacheGH-35168: [CI][Packaging][Conan] Merge upstream changes (apache…

…#35169) ### Rationale for this change There are some changes since the previous synchronization: apache#14671 `72cd6af1dab6e57f82d7da1decb29079bde433b4` or later in https://github.com/conan-io/conan-center-index/commits/master/recipes/arrow ### What changes are included in this PR? Run `ci/conan/merge_upstream.sh` and resolve conflicts manually. ### Are these changes tested? Yes. ### Are there any user-facing changes? No. * Closes: apache#35168 Authored-by: Sutou Kouhei <kou@clear-code.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
Bit-Quill · May 15, 2023 · d097851 · d097851
1 parent b086d50
commit d097851
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 517 deletions.
diff --git a/ci/conan/all/conandata.yml b/ci/conan/all/conandata.yml
@@ -21,56 +21,43 @@
 # SOFTWARE.
 
 sources:
+  "10.0.1":
+    url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-10.0.1/apache-arrow-10.0.1.tar.gz?action=download"
+    sha256: "c814e0670112a22c1a6ec03ab420a52ae236a9a42e9e438c3cbd37f37e658fb3"
   "10.0.0":
-    url: "https://github.com/apache/arrow/archive/apache-arrow-10.0.0.tar.gz"
-    sha256: "2852b21f93ee84185a9d838809c9a9c41bf6deca741bed1744e0fdba6cc19e3f"
+    url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-10.0.0/apache-arrow-10.0.0.tar.gz?action=download"
+    sha256: "5b46fa4c54f53e5df0019fe0f9d421e93fc906b625ebe8e89eed010d561f1f12"
   "8.0.1":
-    url: "https://github.com/apache/arrow/archive/apache-arrow-8.0.1.tar.gz"
-    sha256: "e4c86329be769f2c8778aacc8d6220a9a13c90d59d4988f9349d51299dacbd11"
+    url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-8.0.1/apache-arrow-8.0.1.tar.gz?action=download"
+    sha256: "82d46929f7574715551da21700f100b39f99c3c4d6790f26cac86d869d64e94e"
   "8.0.0":
-    url: "https://github.com/apache/arrow/archive/apache-arrow-8.0.0.tar.gz"
-    sha256: "19ece12de48e51ce4287d2dee00dc358fbc5ff02f41629d16076f77b8579e272"
+    url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-8.0.0/apache-arrow-8.0.0.tar.gz?action=download"
+    sha256: "ad9a05705117c989c116bae9ac70492fe015050e1b80fb0e38fde4b5d863aaa3"
   "7.0.0":
-    url: "https://github.com/apache/arrow/archive/apache-arrow-7.0.0.tar.gz"
-    sha256: "57e13c62f27b710e1de54fd30faed612aefa22aa41fa2c0c3bacd204dd18a8f3"
+    url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-7.0.0/apache-arrow-7.0.0.tar.gz?action=download"
+    sha256: "e8f49b149a15ecef4e40fcfab1b87c113c6b1ee186005c169e5cdf95d31a99de"
   "2.0.0":
-    url: "https://github.com/apache/arrow/archive/apache-arrow-2.0.0.tar.gz"
-    sha256: "ea299df9cf440cfc43393ce12ee6d9a4c9d0dfa9fde33c3bc9b70ec25520a844"
+    url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-2.0.0/apache-arrow-2.0.0.tar.gz?action=download"
+    sha256: "be0342cc847bb340d86aeaef43596a0b6c1dbf1ede9c789a503d939e01c71fbe"
   "1.0.0":
-    url: "https://github.com/apache/arrow/archive/apache-arrow-1.0.0.tar.gz"
-    sha256: "08fbd4c633c08939850d619ca0224c75d7a0526467c721c0838b8aa7efccb270"
+    url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-1.0.0/apache-arrow-1.0.0.tar.gz?action=download"
+    sha256: "86ddb9feb48203a5aaf9cc4f2827525e20a2ca4d7239e492af17e74532ccf243"
 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":
-    - 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":
-    - 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":
-    - 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"
@@ -80,26 +67,20 @@ patches:
   "2.0.0":
     - 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_type: "official"
     - patch_file: "patches/2.0.0-0005-gandiva-engine.patch"
       patch_description: "fix grandiva compilation error"
-      patch_type: "backport"
+      patch_type: "official"
     - patch_file: "patches/2.0.0-0008-fix-cmake.patch"
       patch_description: "use cci package"
       patch_type: "conan"
   "1.0.0":
     - 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_type: "official"
     - 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_type: "official"
     - patch_file: "patches/1.0.0-0006-fix-cmake.patch"
       patch_description: "use cci package"
       patch_type: "conan"
diff --git a/ci/conan/all/conanfile.py b/ci/conan/all/conanfile.py
@@ -434,7 +434,7 @@ def source(self):
             return
         # END
         get(self, **self.conan_data["sources"][self.version],
-                  destination=self.source_folder, strip_root=True)
+                  filename=f"apache-arrow-{self.version}.tar.gz", destination=self.source_folder, strip_root=True)
 
     def generate(self):
         # BUILD_SHARED_LIBS and POSITION_INDEPENDENT_CODE are automatically parsed when self.options.shared or self.options.fPIC exist
@@ -450,7 +450,7 @@ def generate(self):
         if is_msvc(self):
             tc.variables["ARROW_USE_STATIC_CRT"] = is_msvc_static_runtime(self)
         tc.variables["ARROW_DEPENDENCY_SOURCE"] = "SYSTEM"
-        tc.variables["ARROW_PACKAGE_KIND"] = "conan"
+        tc.variables["ARROW_PACKAGE_KIND"] = "conan" # See https://github.com/conan-io/conan-center-index/pull/14903/files#r1057938314 for details
         tc.variables["ARROW_GANDIVA"] = bool(self.options.gandiva)
         tc.variables["ARROW_PARQUET"] = self._parquet()
         tc.variables["ARROW_SUBSTRAIT"] = bool(self.options.get_safe("substrait", False))
@@ -471,8 +471,8 @@ def generate(self):
         tc.variables["ARROW_CSV"] = bool(self.options.with_csv)
         tc.variables["ARROW_CUDA"] = bool(self.options.with_cuda)
         tc.variables["ARROW_JEMALLOC"] = self._with_jemalloc()
-        tc.variables["ARROW_MIMALLOC"] = bool(self.options.with_mimalloc)
         tc.variables["jemalloc_SOURCE"] = "SYSTEM"
+        tc.variables["ARROW_MIMALLOC"] = bool(self.options.with_mimalloc)
         tc.variables["ARROW_JSON"] = bool(self.options.with_json)
         tc.variables["google_cloud_cpp_SOURCE"] = "SYSTEM"
         tc.variables["ARROW_GCS"] = bool(self.options.get_safe("with_gcs", False))
@@ -537,7 +537,7 @@ def generate(self):
         tc.variables["AWSSDK_SOURCE"] = "SYSTEM"
         tc.variables["ARROW_BUILD_UTILITIES"] = bool(self.options.cli)
         tc.variables["ARROW_BUILD_INTEGRATION"] = False
-        tc.variables["ARROW_INSTALL_NAME_RPATH"] = False
+        tc.variables["ARROW_INSTALL_NAME_RPATH"] = True
         tc.variables["ARROW_BUILD_EXAMPLES"] = False
         tc.variables["ARROW_BUILD_TESTS"] = False
         tc.variables["ARROW_ENABLE_TIMING_TESTS"] = False
@@ -560,11 +560,10 @@ def generate(self):
 
     def _patch_sources(self):
         apply_conandata_patches(self)
-        if Version(self.version) >= "7.0.0" and Version(self.version) < "11.0.0":
+        if "7.0.0" <= Version(self.version) < "10.0.0":
             for filename in glob.glob(os.path.join(self.source_folder, "cpp", "cmake_modules", "Find*.cmake")):
                 if os.path.basename(filename) not in [
                     "FindArrow.cmake",
-                    "FindArrowAcero.cmake",
                     "FindArrowCUDA.cmake",
                     "FindArrowDataset.cmake",
                     "FindArrowFlight.cmake",
@@ -630,6 +629,8 @@ def package_info(self):
             self.cpp_info.components["libparquet"].names["cmake_find_package_multi"] = "parquet"
             self.cpp_info.components["libparquet"].names["pkg_config"] = "parquet"
             self.cpp_info.components["libparquet"].requires = ["libarrow"]
+            if not self.options.shared:
+                self.cpp_info.components["libparquet"].defines = ["PARQUET_STATIC"]
 
         if self.options.get_safe("substrait", False):
             self.cpp_info.components["libarrow_substrait"].libs = [self._lib_name("arrow_substrait")]
@@ -651,6 +652,8 @@ def package_info(self):
             self.cpp_info.components["libgandiva"].names["cmake_find_package_multi"] = "gandiva"
             self.cpp_info.components["libgandiva"].names["pkg_config"] = "gandiva"
             self.cpp_info.components["libgandiva"].requires = ["libarrow"]
+            if not self.options.shared:
+                self.cpp_info.components["libgandiva"].defines = ["GANDIVA_STATIC"]
 
         if self._with_flight_rpc():
             self.cpp_info.components["libarrow_flight"].libs = [self._lib_name("arrow_flight")]
@@ -697,7 +700,11 @@ def package_info(self):
         if self.options.with_mimalloc:
             self.cpp_info.components["libarrow"].requires.append("mimalloc::mimalloc")
         if self._with_re2():
-            self.cpp_info.components["libgandiva"].requires.append("re2::re2")
+            if self.options.gandiva:
+                self.cpp_info.components["libgandiva"].requires.append("re2::re2")
+            if self._parquet():
+                self.cpp_info.components["libparquet"].requires.append("re2::re2")
+            self.cpp_info.components["libarrow"].requires.append("re2::re2")
         if self._with_llvm():
             self.cpp_info.components["libgandiva"].requires.append("llvm-core::llvm-core")
         if self._with_protobuf():

diff --git a/ci/conan/all/patches/1.0.0-0004-mallctl-takes-size_t.patch b/ci/conan/all/patches/1.0.0-0004-mallctl-takes-size_t.patch
diff --git a/ci/conan/all/patches/10.0.0-0001-mallctl-takes-size_t.patch b/ci/conan/all/patches/10.0.0-0001-mallctl-takes-size_t.patch