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 all 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
29 changes: 26 additions & 3 deletions cpp/cmake_modules/ThirdpartyToolchain.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Comment thread
lidavidm marked this conversation as resolved.
Outdated
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 DownExpand 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)

@koukouDec 8, 2021

Copy link
Copy Markdown
Member

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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@")

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

Expand DownExpand 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}"
)
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
5 changes: 2 additions & 3 deletions cpp/src/arrow/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -563,10 +563,9 @@ add_arrow_lib(arrow
${ARROW_SHARED_PRIVATE_LINK_LIBS}
STATIC_LINK_LIBS
${ARROW_STATIC_LINK_LIBS}
${ARROW_STATIC_INSTALL_INTERFACE_LIBS}
SHARED_INSTALL_INTERFACE_LIBS
${ARROW_SHARED_INSTALL_INTERFACE_LIBS}
STATIC_INSTALL_INTERFACE_LIBS
${ARROW_STATIC_INSTALL_INTERFACE_LIBS})
${ARROW_SHARED_INSTALL_INTERFACE_LIBS})

add_dependencies(arrow ${ARROW_LIBRARIES})

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

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 all 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


29 changes: 26 additions & 3 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Comment thread
lidavidm marked this conversation as resolved.


Outdated

 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 DownExpand 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)
@koukouDec 8, 2021

Copy link


Copy Markdown

Member
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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@")

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

Expand DownExpand 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}"
 )
 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

5 changes: 2 additions & 3 deletions
cpp/src/arrow/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -563,10 +563,9 @@ add_arrow_lib(arrow
 ${ARROW_SHARED_PRIVATE_LINK_LIBS}
 STATIC_LINK_LIBS
 ${ARROW_STATIC_LINK_LIBS}
 ${ARROW_STATIC_INSTALL_INTERFACE_LIBS}
 SHARED_INSTALL_INTERFACE_LIBS
 ${ARROW_SHARED_INSTALL_INTERFACE_LIBS}
 STATIC_INSTALL_INTERFACE_LIBS
 ${ARROW_STATIC_INSTALL_INTERFACE_LIBS})
 ${ARROW_SHARED_INSTALL_INTERFACE_LIBS})

add_dependencies(arrow ${ARROW_LIBRARIES})

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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 all 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


29 changes: 26 additions & 3 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Comment thread
lidavidm marked this conversation as resolved.


Outdated

 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 DownExpand 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)
@koukouDec 8, 2021

Copy link


Copy Markdown

Member
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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@")

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

Expand DownExpand 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}"
 )
 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

5 changes: 2 additions & 3 deletions
cpp/src/arrow/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -563,10 +563,9 @@ add_arrow_lib(arrow
 ${ARROW_SHARED_PRIVATE_LINK_LIBS}
 STATIC_LINK_LIBS
 ${ARROW_STATIC_LINK_LIBS}
 ${ARROW_STATIC_INSTALL_INTERFACE_LIBS}
 SHARED_INSTALL_INTERFACE_LIBS
 ${ARROW_SHARED_INSTALL_INTERFACE_LIBS}
 STATIC_INSTALL_INTERFACE_LIBS
 ${ARROW_STATIC_INSTALL_INTERFACE_LIBS})
 ${ARROW_SHARED_INSTALL_INTERFACE_LIBS})

add_dependencies(arrow ${ARROW_LIBRARIES})

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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 all 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


29 changes: 26 additions & 3 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Comment thread
lidavidm marked this conversation as resolved.


Outdated

 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 DownExpand 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)
@koukouDec 8, 2021

Copy link


Copy Markdown

Member
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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@")

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

Expand DownExpand 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}"
 )
 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

5 changes: 2 additions & 3 deletions
cpp/src/arrow/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -563,10 +563,9 @@ add_arrow_lib(arrow
 ${ARROW_SHARED_PRIVATE_LINK_LIBS}
 STATIC_LINK_LIBS
 ${ARROW_STATIC_LINK_LIBS}
 ${ARROW_STATIC_INSTALL_INTERFACE_LIBS}
 SHARED_INSTALL_INTERFACE_LIBS
 ${ARROW_SHARED_INSTALL_INTERFACE_LIBS}
 STATIC_INSTALL_INTERFACE_LIBS
 ${ARROW_STATIC_INSTALL_INTERFACE_LIBS})
 ${ARROW_SHARED_INSTALL_INTERFACE_LIBS})

add_dependencies(arrow ${ARROW_LIBRARIES})

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

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 all 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


29 changes: 26 additions & 3 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Comment thread
lidavidm marked this conversation as resolved.


Outdated

 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 DownExpand 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)
@koukouDec 8, 2021

Copy link


Copy Markdown

Member
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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@")

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

Expand DownExpand 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}"
 )
 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

5 changes: 2 additions & 3 deletions
cpp/src/arrow/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -563,10 +563,9 @@ add_arrow_lib(arrow
 ${ARROW_SHARED_PRIVATE_LINK_LIBS}
 STATIC_LINK_LIBS
 ${ARROW_STATIC_LINK_LIBS}
 ${ARROW_STATIC_INSTALL_INTERFACE_LIBS}
 SHARED_INSTALL_INTERFACE_LIBS
 ${ARROW_SHARED_INSTALL_INTERFACE_LIBS}
 STATIC_INSTALL_INTERFACE_LIBS
 ${ARROW_STATIC_INSTALL_INTERFACE_LIBS})
 ${ARROW_SHARED_INSTALL_INTERFACE_LIBS})

add_dependencies(arrow ${ARROW_LIBRARIES})

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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 all 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


29 changes: 26 additions & 3 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Comment thread
lidavidm marked this conversation as resolved.


Outdated

 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 DownExpand 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)
@koukouDec 8, 2021

Copy link


Copy Markdown

Member
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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@")

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

Expand DownExpand 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}"
 )
 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

5 changes: 2 additions & 3 deletions
cpp/src/arrow/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -563,10 +563,9 @@ add_arrow_lib(arrow
 ${ARROW_SHARED_PRIVATE_LINK_LIBS}
 STATIC_LINK_LIBS
 ${ARROW_STATIC_LINK_LIBS}
 ${ARROW_STATIC_INSTALL_INTERFACE_LIBS}
 SHARED_INSTALL_INTERFACE_LIBS
 ${ARROW_SHARED_INSTALL_INTERFACE_LIBS}
 STATIC_INSTALL_INTERFACE_LIBS
 ${ARROW_STATIC_INSTALL_INTERFACE_LIBS})
 ${ARROW_SHARED_INSTALL_INTERFACE_LIBS})

add_dependencies(arrow ${ARROW_LIBRARIES})

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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 all 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


29 changes: 26 additions & 3 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Comment thread
lidavidm marked this conversation as resolved.


Outdated

 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 DownExpand 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)
@koukouDec 8, 2021

Copy link


Copy Markdown

Member
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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@")

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

Expand DownExpand 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}"
 )
 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

5 changes: 2 additions & 3 deletions
cpp/src/arrow/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -563,10 +563,9 @@ add_arrow_lib(arrow
 ${ARROW_SHARED_PRIVATE_LINK_LIBS}
 STATIC_LINK_LIBS
 ${ARROW_STATIC_LINK_LIBS}
 ${ARROW_STATIC_INSTALL_INTERFACE_LIBS}
 SHARED_INSTALL_INTERFACE_LIBS
 ${ARROW_SHARED_INSTALL_INTERFACE_LIBS}
 STATIC_INSTALL_INTERFACE_LIBS
 ${ARROW_STATIC_INSTALL_INTERFACE_LIBS})
 ${ARROW_SHARED_INSTALL_INTERFACE_LIBS})

add_dependencies(arrow ${ARROW_LIBRARIES})

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

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 all 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


29 changes: 26 additions & 3 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff 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
Comment thread
lidavidm marked this conversation as resolved.


Outdated

 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 DownExpand 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)
@koukouDec 8, 2021

Copy link


Copy Markdown

Member
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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@")

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

Expand DownExpand 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}"
 )
 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

5 changes: 2 additions & 3 deletions
cpp/src/arrow/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -563,10 +563,9 @@ add_arrow_lib(arrow
 ${ARROW_SHARED_PRIVATE_LINK_LIBS}
 STATIC_LINK_LIBS
 ${ARROW_STATIC_LINK_LIBS}
 ${ARROW_STATIC_INSTALL_INTERFACE_LIBS}
 SHARED_INSTALL_INTERFACE_LIBS
 ${ARROW_SHARED_INSTALL_INTERFACE_LIBS}
 STATIC_INSTALL_INTERFACE_LIBS
 ${ARROW_STATIC_INSTALL_INTERFACE_LIBS})
 ${ARROW_SHARED_INSTALL_INTERFACE_LIBS})

add_dependencies(arrow ${ARROW_LIBRARIES})

Expand Down