Skip to content

Commit

Permalink
install_builder_prerequisites failed after recent Helios upgrade
Browse files Browse the repository at this point in the history
Instead of always trying to install {gcc,g++}-runtime version 13,
update them to the latest if they are not new enough to support
the pre-compiled illumos clickhouse binaries.

Fixes #7292
  • Loading branch information
citrus-it committed Dec 20, 2024
1 parent 460f038 commit 9ac0de1
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions tools/install_builder_prerequisites.sh
Original file line number Diff line number Diff line change
Expand Up @@ -138,22 +138,26 @@ function install_packages {
fi
elif [[ "${HOST_OS}" == "SunOS" ]]; then
CLANGVER=15
RTVER=13
PGVER=13
packages=(
"pkg:/package/pkg"
"build-essential"
"library/postgresql-$PGVER"
"pkg-config"
"library/libxmlsec1"
"system/library/gcc-runtime@$RTVER"
"system/library/g++-runtime@$RTVER"
# "bindgen leverages libclang to preprocess, parse, and type check C and C++ header files."
"pkg:/ooce/developer/clang-$CLANGVER"
"system/library/gcc-runtime"
"system/library/g++-runtime"
)

# The clickhouse binary depends on the {gcc,g++}-runtime packages being
# at least version 13.
RTVER=13
for p in system/runtime/gcc-runtime system/runtime/g++-runtime; do
[[ $(pkg list -Ho release $p) < $RTVER ]] && packages+=($p@latest)
done

# Install/update the set of packages.
# Explicitly manage the return code using "rc" to observe the result of this
# command without exiting the script entirely (due to bash's "errexit").
Expand Down

0 comments on commit 9ac0de1

Please sign in to comment.