Skip to content

Commit edbb537

Browse files
committed
Disabled xz build on centos.
Fixed removal of .so files called before exiting child directory.
1 parent 97dccef commit edbb537

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ if [ ! -e "./inotify-tools-3.14/libinotifytools/src/.libs/libinotifytools.a" ] ;
3030
./configure --prefix=`pwd`/build --libdir=`pwd`/build/lib
3131
make
3232
make install
33-
rm inotify-tools-3.14/build/lib/*.so*
3433
cd -
34+
rm inotify-tools-3.14/build/lib/*.so*
3535
fi
3636

3737
# Build lzma
@@ -42,8 +42,8 @@ if [ ! -e "./xz-5.2.3/build/lib/liblzma.a" ] ; then
4242
mkdir -p build/lib
4343
./configure --prefix=`pwd`/build --libdir=`pwd`/build/lib --enable-static
4444
make && make install
45-
rm xz-5.2.3/build/lib/*.so*
4645
cd -
46+
rm xz-5.2.3/build/lib/*.so*
4747
fi
4848

4949
# Build openssl
@@ -54,8 +54,8 @@ if [ ! -e "./openssl-1.1.0c/build/lib/libssl.a" ] ; then
5454
mkdir -p build/lib
5555
./config --prefix=`pwd`/build
5656
make && make install
57-
rm openssl-1.1.0c/build/lib/*.so*
5857
cd -
58+
rm openssl-1.1.0c/build/lib/*.so*
5959
fi
6060

6161
# Patch squashfuse_ll to be a library rather than an executable

install-build-deps.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ if [ -e /usr/bin/yum ] ; then
4646
. /opt/rh/autotools-latest/enable
4747

4848
# Unlike Ubuntu, CentOS does not provide .a, so we need to build it
49-
wget http://tukaani.org/xz/xz-5.2.2.tar.gz
50-
tar xzfv xz-5.2.2.tar.gz
51-
cd xz-5.2.2
52-
./configure --enable-static && make && make install
53-
rm /usr/local/lib/liblzma.so* /usr/*/liblzma.so || true # Don't want the dynamic one
54-
cd -
49+
#wget http://tukaani.org/xz/xz-5.2.2.tar.gz
50+
#tar xzfv xz-5.2.2.tar.gz
51+
#cd xz-5.2.2
52+
#./configure --enable-static && make && make install
53+
#rm /usr/local/lib/liblzma.so* /usr/*/liblzma.so || true # Don't want the dynamic one
54+
#cd -
5555
fi
5656

5757
# Install dependencies for Arch Linux

0 commit comments

Comments
 (0)