Skip to content

Commit 2b43fe7

Browse files
committed
Remove build.sh conditional check for nvidia-cuda-toolkit and enforce it into debian-forky
1 parent b0df0cf commit 2b43fe7

3 files changed

Lines changed: 8 additions & 11 deletions

File tree

dev/tasks/linux-packages/apache-arrow/apt/debian-forky/Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,8 @@ RUN \
8888
apt install -y -V ${quiet} nvidia-cuda-toolkit; \
8989
fi && \
9090
apt clean
91+
92+
# nvidia-cuda-toolkit was removed from Debian forky amd64, so disable the
93+
# CUDA packages via the pkg.apache-arrow.nocuda build profile.See GH-50090.
94+
# Once nvidia-cuda-toolkit is re-added to Debian forky, this can be removed.
95+
ENV DEB_BUILD_PROFILES=pkg.apache-arrow.nocuda

dev/tasks/linux-packages/apache-arrow/debian/control.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ Build-Depends:
3131
ninja-build,
3232
nlohmann-json-dev | nlohmann-json3-dev,
3333
# nvidia-cuda-toolkit may be unavailable (e.g. removed from Debian forky).
34-
# apt/build.sh enables the pkg.apache-arrow.nocuda profile in that case so
35-
# this build dependency and the CUDA packages below are skipped.
34+
# The pkg.apache-arrow.nocuda build profile (set via DEB_BUILD_PROFILES, e.g.
35+
# in the debian-forky Dockerfile) skips this build dependency and the CUDA
36+
# packages below.
3637
nvidia-cuda-toolkit [!arm64] <!pkg.apache-arrow.nocuda>,
3738
pkg-config,
3839
protobuf-compiler,

dev/tasks/linux-packages/apt/build.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,6 @@ fi
119119
: ${DEB_BUILD_OPTIONS:="parallel=$(nproc)"}
120120
# DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS} noopt"
121121
export DEB_BUILD_OPTIONS
122-
# nvidia-cuda-toolkit may be unavailable (e.g. it was removed from Debian
123-
# forky). Disable the CUDA packages via the pkg.apache-arrow.nocuda build
124-
# profile when it isn't installed. debian/rules disables ARROW_CUDA the
125-
# same way. See GH-50090.
126-
if ! dpkg -l nvidia-cuda-toolkit > /dev/null 2>&1; then
127-
DEB_BUILD_PROFILES="${DEB_BUILD_PROFILES:-} pkg.apache-arrow.nocuda"
128-
export DEB_BUILD_PROFILES
129-
debuild_options+=(-eDEB_BUILD_PROFILES)
130-
fi
131122
df -h
132123
if [ "${DEBUG:-no}" = "yes" ]; then
133124
run debuild "${debuild_options[@]}" "${dpkg_buildpackage_options[@]}"

0 commit comments

Comments
 (0)