File tree Expand file tree Collapse file tree 1 file changed +3
-15
lines changed Expand file tree Collapse file tree 1 file changed +3
-15
lines changed Original file line number Diff line number Diff line change @@ -20,17 +20,6 @@ debian_build_gtest() {
2020 cd ..
2121}
2222
23- # Centos doesn't have a working version of the inih library, so we need to build it ourselves.
24- centos_build_inih () {
25- [-d inih_build ] || git clone https://github.com/benhoyt/inih.git inih_build
26- cd inih_build
27- git checkout r58
28- meson --buildtype=plain builddir
29- meson compile -C builddir
30- meson install -C builddir
31- cd ..
32- }
33-
3423# workaround for really bare-bones Archlinux containers:
3524if [ -x " $( command -v pacman) " ]; then
3625 pacman --noconfirm -Sy
@@ -68,14 +57,13 @@ case "$distro_id" in
6857
6958 ' rhel' )
7059 dnf clean all
71- dnf -y install gcc-c++ clang cmake ninja-build expat-devel zlib-devel brotli-devel libssh-devel libcurl-devel inih-devel fmt-devel
60+ dnf -y install gcc-c++ clang cmake ninja-build expat-devel zlib-devel brotli-devel libssh-devel libcurl-devel inih-devel
7261 ;;
7362
7463 ' centos' )
7564 dnf clean all
76- dnf -y install gcc-c++ clang cmake expat-devel zlib-devel brotli-devel libssh-devel libcurl-devel git fmt-devel
77- dnf -y --enablerepo=crb install ninja-build meson
78- centos_build_inih
65+ dnf -y install gcc-c++ clang cmake expat-devel zlib-devel brotli-devel libssh-devel libcurl-devel inih-devel
66+ dnf -y --enablerepo=crb install ninja-build
7967 ;;
8068
8169 ' opensuse-tumbleweed' )
You can’t perform that action at this time.
0 commit comments