Skip to content

Commit

Permalink
Added centos 8 dependency fixes (#74)
Browse files Browse the repository at this point in the history
(cherry picked from commit 57170e0)
  • Loading branch information
amdkila authored and ntrost57 committed May 20, 2020
1 parent e1c0144 commit 1072482
Showing 1 changed file with 16 additions and 7 deletions.
23 changes: 16 additions & 7 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -129,19 +129,21 @@ install_packages( )
# dependencies needed for library and clients to build
local library_dependencies_ubuntu=( "make" "cmake-curses-gui" "pkg-config" "libnuma1" )
local library_dependencies_centos=( "epel-release" "make" "cmake3" "gcc-c++" "rpm-build" "numactl-libs" )
local library_dependencies_centos8=( "epel-release" "make" "cmake3" "gcc-c++" "rpm-build" "numactl-libs" )
local library_dependencies_fedora=( "make" "cmake" "gcc-c++" "libcxx-devel" "rpm-build" "numactl-libs" )
local library_dependencies_sles=( "make" "cmake" "gcc-c++" "libcxxtools9" "rpm-build" )

local client_dependencies_ubuntu=( "libboost-program-options-dev" "python3" "python3-yaml" )
local client_dependencies_centos=( "boost-devel" "python36" "python3-pip" )
local client_dependencies_centos8=( "boost-devel" "python36" "python3-pip" )
local client_dependencies_fedora=( "boost-devel" "python36" "PyYAML" "python3-pip" )
local client_dependencies_sles=( "libboost_program_options1_66_0-devel" "pkg-config" "dpkg" "python3-pip" )

if [[ ( "${ID}" == "centos" ) || ( "${ID}" == "rhel" ) ]]; then
if [[ "${VERSION_ID}" == "8" ]]; then
client_dependencies_centos+=( "python3-pyyaml" )
client_dependencies_centos8+=( "python3-pyyaml" )
else
client_dependencies_centos+=( "PyYAML" )
client_dependencies_centos8+=( "PyYAML" )
fi
fi

Expand All @@ -159,11 +161,18 @@ install_packages( )
# yum -y update brings *all* installed packages up to date
# without seeking user approval
# elevate_if_not_root yum -y update
install_yum_packages "${library_dependencies_centos[@]}"

if [[ "${build_clients}" == true ]]; then
install_yum_packages "${client_dependencies_centos[@]}"
pip3 install pyyaml
if [[ "${VERSION_ID}" == "8" ]]; then
install_yum_packages "${library_dependencies_centos8[@]}"
if [[ "${build_clients}" == true ]]; then
install_yum_packages "${client_dependencies_centos8[@]}"
pip3 install pyyaml
fi
else
install_yum_packages "${library_dependencies_centos[@]}"
if [[ "${build_clients}" == true ]]; then
install_yum_packages "${client_dependencies_centos[@]}"
pip3 install pyyaml
fi
fi
;;

Expand Down

0 comments on commit 1072482

Please sign in to comment.