Skip to content

ARROW-16785: [Packaging][Linux] Add FindThrift.cmake #13337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kszucs merged 3 commits into from
Jun 8, 2022
Merged

ARROW-16785: [Packaging][Linux] Add FindThrift.cmake #13337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
394b1a3
ARROW-16785: [Packaging][Linux] Add FindThrift.cmake
kou Jun 8, 2022
e68eb9f
Add Thrift availability check
kou Jun 8, 2022
db7b4a3
Fix a typo
kou Jun 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev/tasks/linux-packages/apache-arrow/debian/libarrow-dev.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ usr/lib/*/cmake/arrow/ArrowTargets*.cmake
usr/lib/*/cmake/arrow/Find*Alt.cmake
usr/lib/*/cmake/arrow/FindArrow.cmake
usr/lib/*/cmake/arrow/FindBrotli.cmake
usr/lib/*/cmake/arrow/Find[Suz]*.cmake
usr/lib/*/cmake/arrow/Find[STuz]*.cmake
usr/lib/*/cmake/arrow/arrow-config.cmake
usr/lib/*/libarrow.a
usr/lib/*/libarrow.so
Expand Down
8 changes: 7 additions & 1 deletion dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,12 @@
%define use_python (%{rhel} >= 8)
# TODO: Enable this. This works on local but is fragile on GitHub Actions and
# Travis CI.
# %%define use_s3 (%{rhel} >= 8)
# %%define use_s3 (%%{rhel} >= 8)
%define use_s3 0

%define have_rapidjson (%{rhel} != 8)
%define have_re2 (%{rhel} >= 8)
%define have_thrift (%{rhel} >= 8)
%define have_utf8proc (%{rhel} >= 9)
%define have_zstd (!%{is_amazon_linux})

Expand Down Expand Up @@ -122,7 +123,9 @@ BuildRequires: rapidjson-devel
BuildRequires: re2-devel
%endif
BuildRequires: snappy-devel
%if %{have_thrift}
BuildRequires: thrift-devel
%endif
%if %{have_utf8proc}
BuildRequires: utf8proc-devel
%endif
Expand Down Expand Up @@ -294,6 +297,9 @@ Libraries and header files for Apache Arrow C++.
%{_libdir}/cmake/arrow/FindArrow.cmake
%{_libdir}/cmake/arrow/FindBrotli.cmake
%{_libdir}/cmake/arrow/FindSnappy.cmake
%if %{have_thrift}
%{_libdir}/cmake/arrow/FindThrift.cmake
%endif
%if %{use_flight}
%{_libdir}/cmake/arrow/Findc-aresAlt.cmake
%endif
Expand Down