This is an automated email from the ASF dual-hosted git repository. kszucs pushed a commit to branch maint-6.0.x in repository https://gitbox.apache.org/repos/asf/arrow.git
commit eee58669091f8addad001b31727221168845ca4c Author: Sutou Kouhei <[email protected]> AuthorDate: Wed Oct 27 13:28:09 2021 +0200 ARROW-14486: [Packaging][deb] Add missing libthrift-dev dependency Closes #11555 from kou/packaging-linux-thrift-dev Authored-by: Sutou Kouhei <[email protected]> Signed-off-by: Krisztián Szűcs <[email protected]> --- dev/release/verify-apt.sh | 2 ++ dev/release/verify-yum.sh | 5 ++++- dev/tasks/linux-packages/apache-arrow/Rakefile | 21 ++++++++++++++++----- .../linux-packages/apache-arrow/debian/control.in | 2 ++ 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dev/release/verify-apt.sh b/dev/release/verify-apt.sh index 2aa0d7f..3773e27 100755 --- a/dev/release/verify-apt.sh +++ b/dev/release/verify-apt.sh @@ -148,6 +148,8 @@ pushd build/minimal_build cmake . make -j$(nproc) ./arrow_example +c++ -std=c++11 -o arrow_example example.cc $(pkg-config --cflags --libs arrow) +./arrow_example popd echo "::endgroup::" diff --git a/dev/release/verify-yum.sh b/dev/release/verify-yum.sh index 1a48cc5..a7f572a 100755 --- a/dev/release/verify-yum.sh +++ b/dev/release/verify-yum.sh @@ -152,13 +152,16 @@ ${install_command} \ gcc-c++ \ git \ libarchive \ - make + make \ + pkg-config mkdir -p build cp -a /arrow/cpp/examples/minimal_build build pushd build/minimal_build ${cmake_command} . make -j$(nproc) ./arrow_example +c++ -std=c++11 -o arrow_example example.cc $(pkg-config --cflags --libs arrow) +./arrow_example popd if [ "${have_glib}" = "yes" ]; then diff --git a/dev/tasks/linux-packages/apache-arrow/Rakefile b/dev/tasks/linux-packages/apache-arrow/Rakefile index f401a06..9dfae95 100644 --- a/dev/tasks/linux-packages/apache-arrow/Rakefile +++ b/dev/tasks/linux-packages/apache-arrow/Rakefile @@ -96,6 +96,16 @@ class ApacheArrowPackageTask < PackageTask control.gsub(/@CUDA_ARCHITECTURE@/, cuda_architecture) end + def apt_prepare_debian_control_c_ares(control, target) + case target + when /\Aubuntu-bionic/ + use_system_c_ares = "#" + else + use_system_c_ares = "" + end + control.gsub(/@USE_SYSTEM_C_ARES@/, use_system_c_ares) + end + def apt_prepare_debian_control_grpc(control, target) case target when /\Adebian-buster/, /\Aubuntu-(?:bionic|focal)/ @@ -106,14 +116,14 @@ class ApacheArrowPackageTask < PackageTask control.gsub(/@USE_SYSTEM_GRPC@/, use_system_grpc) end - def apt_prepare_debian_control_c_ares(control, target) + def apt_prepare_debian_control_thrift(control, target) case target when /\Aubuntu-bionic/ - use_system_c_ares = "#" + use_system_thrift = "#" else - use_system_c_ares = "" + use_system_thrift = "" end - control.gsub(/@USE_SYSTEM_C_ARES@/, use_system_c_ares) + control.gsub(/@USE_SYSTEM_THRIFT@/, use_system_thrift) end def apt_prepare_debian_control_utf8proc(control, target) @@ -139,8 +149,9 @@ class ApacheArrowPackageTask < PackageTask def apt_prepare_debian_control(control_in, target) control = control_in.dup control = apt_prepare_debian_control_cuda_architecture(control, target) - control = apt_prepare_debian_control_grpc(control, target) control = apt_prepare_debian_control_c_ares(control, target) + control = apt_prepare_debian_control_grpc(control, target) + control = apt_prepare_debian_control_thrift(control, target) control = apt_prepare_debian_control_utf8proc(control, target) control = apt_prepare_debian_control_zstd(control, target) control diff --git a/dev/tasks/linux-packages/apache-arrow/debian/control.in b/dev/tasks/linux-packages/apache-arrow/debian/control.in index b6d8497..6b0332e 100644 --- a/dev/tasks/linux-packages/apache-arrow/debian/control.in +++ b/dev/tasks/linux-packages/apache-arrow/debian/control.in @@ -24,6 +24,7 @@ Build-Depends: libre2-dev, libsnappy-dev, libssl-dev, +@USE_SYSTEM_THRIFT@ libthrift-dev, @USE_SYSTEM_UTF8PROC@ libutf8proc-dev, @USE_SYSTEM_ZSTD@ libzstd-dev, ninja-build, @@ -134,6 +135,7 @@ Depends: libre2-dev, libsnappy-dev, libssl-dev, +@USE_SYSTEM_THRIFT@ libthrift-dev, @USE_SYSTEM_UTF8PROC@ libutf8proc-dev, @USE_SYSTEM_ZSTD@ libzstd-dev, @USE_SYSTEM_GRPC@ protobuf-compiler-grpc,
