Skip to content

Commit 8b9977e

Browse files
committed
Use Alpine Linux 3.22
1 parent 8d2e84c commit 8b9977e

File tree

4 files changed

+2
-20
lines changed

4 files changed

+2
-20
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ ULIMIT_CORE=-1
4747

4848
# Default versions for platforms
4949
ALMALINUX=8
50-
ALPINE_LINUX=3.20
50+
ALPINE_LINUX=3.22
5151
DEBIAN=12
5252
FEDORA=42
5353
UBUNTU=22.04
File renamed without changes.

cpp/cmake_modules/FindorcAlt.cmake

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -66,28 +66,10 @@ find_package_handle_standard_args(
6666

6767
if(orcAlt_FOUND)
6868
if(NOT TARGET orc::orc)
69-
# For old Apache Orc. For example, apache-orc 2.0.3 on Alpine
70-
# Linux 3.20 and 3.21.
7169
add_library(orc::orc STATIC IMPORTED)
7270
set_target_properties(orc::orc
7371
PROPERTIES IMPORTED_LOCATION "${ORC_STATIC_LIB}"
7472
INTERFACE_INCLUDE_DIRECTORIES "${ORC_INCLUDE_DIR}")
75-
if(ARROW_WITH_LZ4 AND TARGET LZ4::lz4)
76-
target_link_libraries(orc::orc INTERFACE LZ4::lz4)
77-
endif()
78-
if(ARROW_WITH_SNAPPY AND TARGET Snappy::snappy)
79-
target_link_libraries(orc::orc INTERFACE Snappy::snappy)
80-
endif()
81-
if(ARROW_WITH_ZSTD)
82-
if(TARGET zstd::libzstd_shared)
83-
target_link_libraries(orc::orc INTERFACE zstd::libzstd_shared)
84-
elseif(TARGET zstd::libzstd_static)
85-
target_link_libraries(orc::orc INTERFACE zstd::libzstd_static)
86-
endif()
87-
endif()
88-
if(ARROW_WITH_ZLIB AND TARGET ZLIB::ZLIB)
89-
target_link_libraries(orc::orc INTERFACE ZLIB::ZLIB)
90-
endif()
9173
endif()
9274
set(orcAlt_VERSION ${ORC_VERSION})
9375
endif()

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ services:
219219
# docker compose build alpine-linux-cpp
220220
# docker compose run --rm alpine-linux-cpp
221221
# Parameters:
222-
# ALPINE_LINUX: 3.20
222+
# ALPINE_LINUX: 3.22
223223
# ARCH: amd64, arm64v8, ...
224224
image: ${REPO}:${ARCH}-alpine-linux-${ALPINE_LINUX}-cpp
225225
build:

0 commit comments

Comments
 (0)