arrow: various improvements and fixes.

Author: cyfdecyf

packages/a/arrow/xmake.lua

@@ -8,22 +8,34 @@ package("arrow")
              "https://github.com/apache/arrow.git")
     add_versions('7.0.0', '57e13c62f27b710e1de54fd30faed612aefa22aa41fa2c0c3bacd204dd18a8f3')
 
-    add_configs(csv,      {description = "CSV reader module", default = true, type = "boolean"})
-    add_configs(json,     {description = "JSON reader module", default = false, type = "boolean"})
-    add_configs(engine,   {description = "Build the Arrow Execution Engine", default = true, type = "boolean"})
-    add_configs(dataset,  {description = "Dataset API, implies the Filesystem API", default = true, type = "boolean"})
-    add_configs(orc,      {description = "Arrow integration with Apache ORC", default = false, type = "boolean"})
-    add_configs(parquet,  {description = "Apache Parquet libraries and Arrow integration", default = false, type = "boolean"})
-    add_configs(python,   {description = "Enable Python C++ integration library. Requires python and numpy (not managed by xrepo).", default = false, type = "boolean"})
+    add_configs("csv",      {description = "CSV reader module", default = true, type = "boolean"})
+    add_configs("json",     {description = "JSON reader module", default = false, type = "boolean"})
+    add_configs("engine",   {description = "Build the Arrow Execution Engine", default = true, type = "boolean"})
+    add_configs("dataset",  {description = "Dataset API, implies the Filesystem API", default = true, type = "boolean"})
+    add_configs("orc",      {description = "Arrow integration with Apache ORC", default = false, type = "boolean"})
+    add_configs("parquet",  {description = "Apache Parquet libraries and Arrow integration", default = false, type = "boolean"})
+    add_configs("plasma",   {description = "Plasma Shared Memory Object Store", default = false, type = "boolean"})
+    -- After install with python enabled, the pyarrow package can be built by following command:
+    --     cd <arrow-src>/arrow/python
+    --     export CMAKE_PREFIX_PATH=<xrepo arrow install dir>
+    --     # export options that's enabled for the c++ install, e.g.
+    --     export PYARROW_WITH_PARQUET=1
+    --     export PYARROW_WITH_LZ4=1
+    --     python setup.py -- build_ext --build-type=release --bundle-arrow-cpp bdist_wheel
+    -- Refer to https://arrow.apache.org/docs/developers/python.html#python-development
+    add_configs("python",   {description = "Enable Python C++ integration library. Requires python and numpy (not managed by xmake/xrepo).", default = false, type = "boolean"})
     -- Arrow uses vendored mimalloc and jemalloc. Do not add these two libraries to configdeps.
-    add_configs(mimalloc, {description = "Build the Arrow mimalloc-based allocator", default = true, type = "boolean"})
-    add_configs(jemalloc, {description = "Build the Arrow jemalloc-based allocator", default = false, type = "boolean"})
+    add_configs("mimalloc", {description = "Build the Arrow mimalloc-based allocator", default = true, type = "boolean"})
+    add_configs("jemalloc", {description = "Build the Arrow jemalloc-based allocator", default = false, type = "boolean"})
+    -- If true, arrow will look for shared libraries for third party dependency.
+    -- The pyarrow python package creates shared library that links in all necessary thirdparty static libraries.
+    add_configs("shared_dep", {description = "Use shared library for dependency", default = false, type = "boolean"})
 
     -- Some libraries are required for build with our default config settings.
     local configdeps = {
         re2 = "re2", utf8proc = "utf8proc",
         -- compression libraries
-        brotli = "brotli", bz2 = "bz2", snappy = "snappy", lz4 = "lz4", zlib = "zlib", zstd = "std",
+        brotli = "brotli", bz2 = "bzip2", snappy = "snappy", lz4 = "lz4", zlib = "zlib", zstd = "zstd",
     }
     for config, dep in pairs(configdeps) do
         add_configs(config, {description = "Enable " .. dep .. " support.", default = false, type = "boolean"})
@@ -38,6 +50,21 @@ package("arrow")
     end
 
     on_load(function (package)
+        local links = {}
+        if package:config("plasma") then
+            table.insert(links, "plasma")
+            package:add("deps", "gflags")
+        end
+        if package:config("parquet") then
+            table.insert(links, "parquet")
+        end
+        if package:config("dataset") then
+            table.insert(links, "arrow_dataset")
+        end
+        table.insert(links, "arrow")
+        table.insert(links, "arrow_bundled_dependencies")
+        package:add("links", links)
+
         for name, dep in pairs(configdeps) do
             if package:config(name) then
                 package:add("deps", dep)
@@ -82,7 +109,7 @@ ${yellow}In case of boost dependency conflicts, please use following code (order
         local shared = package:config("shared")
         table.insert(configs, "-DARROW_BUILD_STATIC=" .. (shared and "OFF" or "ON"))
         table.insert(configs, "-DARROW_BUILD_SHARED=" .. (shared and "ON" or "OFF"))
-        table.insert(configs, "-DARROW_DEPENDENCY_USE_SHARED=" .. (shared and "ON" or "OFF"))
+        table.insert(configs, "-DARROW_DEPENDENCY_USE_SHARED=" .. (package:config("shared_dep") and "ON" or "OFF"))
 
         for config, enabled in pairs(package:configs()) do
             if not package:extraconf("configs", config, "builtin") and configdeps[config] == nil then
@@ -97,6 +124,15 @@ ${yellow}In case of boost dependency conflicts, please use following code (order
         -- To fix arrow src/arrow/CMakeLists.txt:538, when CMAKE_SYSTEM_NAME set but CMAKE_SYSTEM_PROCESSOR is not causing error.
         table.insert(configs, "-DCMAKE_SYSTEM_PROCESSOR=" .. (package:is_arch("x86_64") and "x86_64" or "x86"))
 
+        -- For install without internet access, uncommend following code and
+        -- change the url to internal accessible one.
+        --[[
+        if package:version():eq("7.0.0") then
+            -- Use environment variables to define vendored package url.
+            os.setenv("ARROW_MIMALLOC_URL", "https://github.com/microsoft/mimalloc/archive/v1.7.3.tar.gz")
+            os.setenv("ARROW_XSIMD_URL", "https://github.com/xtensor-stack/xsimd/archive/aeec9c872c8b475dedd7781336710f2dd2666cb2.tar.gz")
+        end
+        --]]
         os.cd("cpp")
         import("package.tools.cmake").install(package, configs)
     end)