CI: Update build script for Linux

Enable ZSTD support, and explicitely set the build options as it is required now. Note that the serial backend is disabled on Ubuntu 16.04 as its version of libserialport is too old, and USB support in IIOD is disabled in CentOS 7 as its kernel headers are too old. Signed-off-by: Paul Cercueil <[email protected]>
analogdevicesinc · May 7, 2021 · 9707c35 · 9707c35
1 parent a829080
commit 9707c35
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/CI/travis/before_install_linux b/CI/travis/before_install_linux
@@ -27,7 +27,7 @@ handle_centos() {
 	# FIXME: see about adding `libserialport-dev` from EPEL ; maybe libusb-1.0.0-devel...
 	yum -y groupinstall 'Development Tools'
 	yum -y install cmake libxml2-devel libusb1-devel libaio-devel \
-		bzip2 gzip rpm rpm-build
+		bzip2 gzip rpm rpm-build libzstd-devel
 
 	if [ "$(get_version | head -c 1)" = "7" ] ; then
 		# install Cmake3, and make it the default
@@ -66,7 +66,7 @@ handle_generic_docker() {
 handle_default() {
 	sudo apt-get -qq update
 	sudo DEBIAN_FRONTEND=noninteractive apt-get install -y cmake graphviz \
-		libaio-dev libavahi-client-dev libserialport-dev \
+		libaio-dev libavahi-client-dev libserialport-dev libzstd-dev \
 		libavahi-common-dev libusb-1.0-0-dev libxml2-dev rpm tar \
 		bzip2 gzip flex bison git libncurses5-dev libcdk5-dev \
 		doxygen man2html python3 python3-pip python3-setuptools

diff --git a/CI/travis/make_linux b/CI/travis/make_linux
@@ -44,6 +44,11 @@ handle_default() {
 
 	FLAGS="-DENABLE_PACKAGING=ON -DDEB_DETECT_DEPENDENCIES=ON -DWITH_EXAMPLES=ON ${PYTHON_HELP} ${DOC_HELP} ${MAN_HELP}"
 
+	FLAGS="${FLAGS} -DWITH_ZSTD=ON"
+
+	# Ubuntu Xenial's libserialport is too old
+	[ "${OS_VERSION}" = xenial ] && FLAGS="${FLAGS} -DWITH_SERIAL_BACKEND=OFF"
+
 	echo "### cmake ${FLAGS}"
 	cmake ${FLAGS} ..
 
@@ -103,7 +108,13 @@ handle_centos() {
 	echo "handle centos"
 	mkdir -p build
 	cd build
-	cmake -DENABLE_PACKAGING=ON -DPYTHON_BINDINGS=ON ..
+
+	FLAGS="-DENABLE_PACKAGING=ON -DPYTHON_BINDINGS=ON -DWITH_SERIAL_BACKEND=OFF -DWITH_ZSTD=ON"
+
+	# CentOS 7's kernel headers are too old for USB support in IIOD
+	[ "${OS_VERSION}" = centos7 ] && FLAGS="${FLAGS} -DWITH_IIOD_USBD=OFF"
+
+	cmake ${FLAGS} ..
 	make
 	make package
 	cd ..