Skip to content

Commit 361fa5e

Browse files
committed
WORKAROUND until S3 is moved in apacheGH-50194
1 parent bbefa63 commit 361fa5e

4 files changed

Lines changed: 5 additions & 7 deletions

File tree

‎compose.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,8 @@ services:
292292
ulimits: *ulimits
293293
environment:
294294
<<: [*common, *ccache, *sccache, *cpp]
295+
# WORKAROUND: Remove after S3 is moved out of libarrow (GH-50194)
296+
CXXFLAGS: "-fvisibility-inlines-hidden"
295297
ARROW_BUILD_BENCHMARKS: "ON"
296298
ARROW_BUILD_EXAMPLES: "ON"
297299
ARROW_BUILD_OPENMP_BENCHMARKS: "ON"
@@ -327,6 +329,8 @@ services:
327329
shm_size: *shm-size
328330
environment:
329331
<<: [*common, *ccache, *sccache, *cpp]
332+
# WORKAROUND: Remove after S3 is moved out of libarrow (GH-50194)
333+
CXXFLAGS: "-fvisibility-inlines-hidden"
330334
# Shrink test runtime by enabling minimal optimizations
331335
ARROW_C_FLAGS_DEBUG: "-g1 -Og"
332336
ARROW_CXX_FLAGS_DEBUG: "-g1 -Og"

‎cpp/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,6 @@ else()
367367
check_linker_flag(CXX
368368
"-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/src/arrow/symbols.map"
369369
CXX_LINKER_SUPPORTS_VERSION_SCRIPT)
370-
check_linker_flag(CXX "-Wl,-Bsymbolic-functions"
371-
CXX_LINKER_SUPPORTS_BSYMBOLIC_FUNCTIONS)
372370
endif()
373371

374372
#

‎cpp/src/arrow/CMakeLists.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,10 +1045,6 @@ if(ARROW_FILESYSTEM)
10451045

10461046
add_library(arrow_s3fs MODULE filesystem/s3fs_module.cc filesystem/s3fs.cc)
10471047
target_link_libraries(arrow_s3fs PRIVATE ${AWSSDK_LINK_LIBRARIES} arrow_shared)
1048-
if(CXX_LINKER_SUPPORTS_BSYMBOLIC_FUNCTIONS)
1049-
# Use this module's own S3 global state, not libarrow's copy of the same symbols
1050-
target_link_options(arrow_s3fs PRIVATE "-Wl,-Bsymbolic-functions")
1051-
endif()
10521048
set_source_files_properties(filesystem/s3fs.cc filesystem/s3fs_module.cc
10531049
PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
10541050
endif()

‎cpp/src/arrow/filesystem/s3fs.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3668,7 +3668,7 @@ Result<std::string> ResolveS3BucketRegion(const std::string& bucket) {
36683668
return resolver->ResolveRegion(bucket);
36693669
}
36703670

3671-
static auto kS3FileSystemModule = ARROW_REGISTER_FILESYSTEM(
3671+
auto kS3FileSystemModule = ARROW_REGISTER_FILESYSTEM(
36723672
"s3",
36733673
[](const arrow::util::Uri& uri, const FileSystemFactoryOptions& options,
36743674
const io::IOContext& io_context,

0 commit comments

Comments
 (0)