Skip to content

Commit 5eef0cf

Browse files
committed
build-deps fix for CentOS 7 + trailing whitespace fix
1 parent 0b386d2 commit 5eef0cf

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

build-deps.sh

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,24 @@ get_latest_version() {
2121
fi
2222
}
2323

24-
if [ "$ID" = "almalinux" ] && [ -d /usr/local/share/aclocal ]; then
25-
#needed for manylinux_2_28 container which ships custom autoconf
26-
export ACLOCAL_PATH=/usr/share/aclocal
27-
fi
2824
if [ "$ID" = "almalinux" ] || [ "$ID" = "centos" ] || [ "$ID" = "rhel" ]; then
25+
if [ -d /usr/local/share/aclocal ]; then
26+
#needed for manylinux_2_28 container which ships custom autoconf, possibly others too?
27+
export ACLOCAL_PATH=/usr/share/aclocal
28+
fi
2929
if [ "$VERSION_ID" = "7" ]; then
3030
yum install -y libexttextcat-devel
31-
if [ -d /opt/rh/devtoolset-10/root/usr/lib ]; then
32-
#we are running in the manylinux2014 image
33-
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/opt/rh/devtoolset-10/root/usr/lib
34-
#libxml2 is out of date, compile and install a new one
35-
yum install -y xz
36-
wget https://download.gnome.org/sources/libxml2/2.9/libxml2-2.9.14.tar.xz
37-
unxz libxml2-2.9.14.tar.xz
38-
tar -xf libxml2-2.9.14.tar
39-
cd libxml2-2.9.14 && ./configure --prefix=/usr/ --without-python && make && make install
40-
cd ..
41-
fi
31+
if [ -d /opt/rh/devtoolset-10/root/usr/lib ]; then
32+
#we are running in the manylinux2014 image
33+
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/opt/rh/devtoolset-10/root/usr/lib
34+
#libxml2 is out of date, compile and install a new one
35+
yum install -y xz
36+
wget https://download.gnome.org/sources/libxml2/2.9/libxml2-2.9.14.tar.xz
37+
unxz libxml2-2.9.14.tar.xz
38+
tar -xf libxml2-2.9.14.tar
39+
cd libxml2-2.9.14 && ./configure --prefix=/usr/ --without-python && make && make install
40+
cd ..
41+
fi
4242
elif [ "$VERSION_ID" = "8" ]; then
4343
#they forgot to package libexttextcat-devel? grab one manually:
4444
wget https://github.com/proycon/LaMachine/raw/master/deps/centos8/libexttextcat-devel-3.4.5-2.el8.x86_64.rpm

0 commit comments

Comments
 (0)