Skip to content

ARROW-14708: [C++] Adding missing abseil dependencies to enable static flight build #11889

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

Closed
rok wants to merge 10 commits into from
Closed

ARROW-14708: [C++] Adding missing abseil dependencies to enable static flight build #11889

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d6d7d09
cmake changes and helper scripts
rok Feb 28, 2022
b6e8a23
ArrowConfig.cmake.in
rok Mar 2, 2022
26d27e6
Removing -larrow_bundled_dependencies
rok Mar 3, 2022
95c6df8
Review feedback
rok Mar 3, 2022
aa4f1ca
Adding abseils
rok Mar 6, 2022
c073c60
Remove list-absl-libraries.sh
rok Mar 6, 2022
25b4060
minor change
rok Mar 7, 2022
61ca815
Review feedback and macOS fix for ARROW_BUILD_EXAMPLES=ON
rok Mar 7, 2022
fa7fb39
Review feedback
rok Mar 7, 2022
b4c118b
Review feedback
rok Mar 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
3 changes: 1 addition & 2 deletions cpp/cmake_modules/BuildUtils.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,7 @@ function(ADD_ARROW_LIB LIB_NAME)
PRIVATE_INCLUDES
DEPENDENCIES
SHARED_INSTALL_INTERFACE_LIBS
STATIC_INSTALL_INTERFACE_LIBS
OUTPUT_PATH)
Comment on lines 242 to 243
Copy link
Member

@lidavidm lidavidm Mar 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, did you mean to remove this parameter?

Copy link
Member Author

@rok rok Mar 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Restored.

STATIC_INSTALL_INTERFACE_LIBS)
cmake_parse_arguments(ARG
"${options}"
"${one_value_args}"
Expand Down
29 changes: 26 additions & 3 deletions cpp/cmake_modules/ThirdpartyToolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3412,6 +3412,14 @@ macro(build_absl_once)
absl::raw_logging_internal
absl::strings
absl::time_zone)
if(APPLE)
# This is due to upstream absl::cctz issue
# https://github.com/abseil/abseil-cpp/issues/283
find_library(CoreFoundation CoreFoundation)
set_property(TARGET absl::time
APPEND
PROPERTY INTERFACE_LINK_LIBRARIES ${CoreFoundation})
endif()
set_property(TARGET absl::type_traits PROPERTY INTERFACE_LINK_LIBRARIES absl::config)
set_property(TARGET absl::utility
PROPERTY INTERFACE_LINK_LIBRARIES absl::base_internal absl::config
Expand Down Expand Up @@ -3584,13 +3592,28 @@ macro(build_grpc)
INTERFACE_INCLUDE_DIRECTORIES "${GRPC_INCLUDE_DIR}")

set(GRPC_GPR_ABSL_LIBRARIES
absl::bad_optional_access
absl::base
absl::statusor
absl::status
absl::cord
absl::debugging_internal
absl::demangle_internal
absl::graphcycles_internal
absl::int128
absl::malloc_internal
absl::raw_logging_internal
absl::spinlock_wait
absl::stacktrace
absl::status
absl::statusor
absl::strings
absl::strings_internal
absl::str_format_internal
absl::symbolize
absl::synchronization
absl::time)
absl::throw_delegate
absl::time
absl::time_zone)
Copy link
Member

@kou kou Dec 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we create a one-linear(?) to collect this list like https://github.com/apache/arrow/blob/master/cpp/cmake_modules/ThirdpartyToolchain.cmake#L2659-L2667 ?

It may be better that we have a shell script that generates the list and include it from this file:

# cpp/build-support/list-grpc-absl-libraries.sh
...
echo "set(GRPC_GPR_ABSL_LIBRARIES absl::...)"
$ cpp/build-support/list-grpc-absl-libraries.sh > cpp/cmake_modules/gRPCVariables.cmake
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 66d04acae..36565fdbf 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -3475,14 +3475,7 @@ macro(build_grpc)
                         PROPERTIES IMPORTED_LOCATION "${GRPC_STATIC_LIBRARY_UPB}"
                                    INTERFACE_INCLUDE_DIRECTORIES "${GRPC_INCLUDE_DIR}")
 
-  set(GRPC_GPR_ABSL_LIBRARIES
-      absl::base
-      absl::statusor
-      absl::status
-      absl::cord
-      absl::strings
-      absl::synchronization
-      absl::time)
+  include(gRPCVariables)
   add_library(gRPC::gpr STATIC IMPORTED)
   set_target_properties(gRPC::gpr
                         PROPERTIES IMPORTED_LOCATION "${GRPC_STATIC_LIBRARY_GPR}"


add_library(gRPC::gpr STATIC IMPORTED)
set_target_properties(gRPC::gpr
PROPERTIES IMPORTED_LOCATION "${GRPC_STATIC_LIBRARY_GPR}"
Expand Down
8 changes: 6 additions & 2 deletions cpp/examples/arrow/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,12 @@ if(ARROW_FLIGHT)
message(FATAL_ERROR "Statically built gRPC requires ARROW_BUILD_STATIC=ON")
else()
set(FLIGHT_EXAMPLES_LINK_LIBS arrow_flight_static)
set(GRPC_REFLECTION_LINK_LIBS -Wl,--whole-archive gRPC::grpc++_reflection
-Wl,--no-whole-archive)
if(APPLE)
set(GRPC_REFLECTION_LINK_LIBS -Wl,-force_load gRPC::grpc++_reflection)
else()
set(GRPC_REFLECTION_LINK_LIBS -Wl,--whole-archive gRPC::grpc++_reflection
-Wl,--no-whole-archive)
endif()
endif()

set(FLIGHT_EXAMPLE_GENERATED_PROTO_FILES
Expand Down
10 changes: 6 additions & 4 deletions cpp/src/arrow/ArrowConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ set(ARROW_LIBRARY_PATH_SUFFIXES "@ARROW_LIBRARY_PATH_SUFFIXES@")
set(ARROW_INCLUDE_PATH_SUFFIXES "@ARROW_INCLUDE_PATH_SUFFIXES@")
set(ARROW_SYSTEM_DEPENDENCIES "@ARROW_SYSTEM_DEPENDENCIES@")
set(ARROW_BUNDLED_STATIC_LIBS "@ARROW_BUNDLED_STATIC_LIBS@")
set(ARROW_STATIC_INSTALL_INTERFACE_LIBS "@ARROW_STATIC_INSTALL_INTERFACE_LIBS_REAL@")

include("${CMAKE_CURRENT_LIST_DIR}/ArrowOptions.cmake")

Expand Down Expand Up @@ -79,11 +80,12 @@ if(NOT (TARGET arrow_shared OR TARGET arrow_static))
PROPERTIES
IMPORTED_LOCATION
"${arrow_lib_dir}/${CMAKE_STATIC_LIBRARY_PREFIX}arrow_bundled_dependencies${CMAKE_STATIC_LIBRARY_SUFFIX}"
)

INTERFACE_LINK_LIBRARIES
${ARROW_STATIC_INSTALL_INTERFACE_LIBS}
Copy link
Member

@lidavidm lidavidm Mar 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be quoted.

Copy link
Member Author

@rok rok Mar 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

)
get_property(arrow_static_interface_link_libraries
TARGET arrow_static
PROPERTY INTERFACE_LINK_LIBRARIES)
TARGET arrow_static
PROPERTY INTERFACE_LINK_LIBRARIES)
set_target_properties(
arrow_static PROPERTIES INTERFACE_LINK_LIBRARIES
"${arrow_static_interface_link_libraries};arrow_bundled_dependencies")
Expand Down
6 changes: 3 additions & 3 deletions cpp/src/arrow/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ else()
endif()

if(ARROW_BUILD_BUNDLED_DEPENDENCIES)
string(APPEND ARROW_PC_LIBS_PRIVATE " -larrow_bundled_dependencies")
Copy link
Member

@kou kou Mar 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this removed?

Copy link
Member Author

@rok rok Mar 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Returned.

set(ARROW_STATIC_INSTALL_INTERFACE_LIBS_REAL ${ARROW_STATIC_INSTALL_INTERFACE_LIBS})
Copy link
Member

@kou kou Mar 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need _REAL alias?
Is there any problem if we use ARROW_STATIC_INSTALL_INTERFACE_LIBS directly?

Copy link
Member Author

@rok rok Mar 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing _REAL. It works for me locally, waiting or tests.

endif()
# Need -latomic on Raspbian.
# See also: https://issues.apache.org/jira/browse/ARROW-12860
Expand Down Expand Up @@ -563,10 +563,10 @@ add_arrow_lib(arrow
${ARROW_SHARED_PRIVATE_LINK_LIBS}
STATIC_LINK_LIBS
${ARROW_STATIC_LINK_LIBS}
${ARROW_STATIC_INSTALL_INTERFACE_LIBS_REAL}
SHARED_INSTALL_INTERFACE_LIBS
${ARROW_SHARED_INSTALL_INTERFACE_LIBS}
STATIC_INSTALL_INTERFACE_LIBS
${ARROW_STATIC_INSTALL_INTERFACE_LIBS})
STATIC_INSTALL_INTERFACE_LIBS)
Copy link
Member

@kou kou Mar 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove STATIC_INSTALL_INTERFACE_LIBS?

Copy link
Member Author

@rok rok Mar 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems so. Changed.


add_dependencies(arrow ${ARROW_LIBRARIES})

Expand Down