summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2020-07-26 18:13:43 -0600
committerJens Axboe <axboe@kernel.dk>2020-07-26 18:13:43 -0600
commit63dc69c569660ed168912acce56741b122661f93 (patch)
treeb7ad891b2cb7c40f7fab303c28920406d0aa98b7
parenteba051c43e8f379784a5155908783346061d1002 (diff)
parent7a64f9e42026cdac5efbbe4a605917de3467fae3 (diff)
downloadfio-63dc69c569660ed168912acce56741b122661f93.tar.gz
fio-63dc69c569660ed168912acce56741b122661f93.tar.bz2
Merge branch 'fix_travis_libiscsi' of https://github.com/sitsofe/fio
* 'fix_travis_libiscsi' of https://github.com/sitsofe/fio: travis: fix x86 libiscsi detection travis: remove unneeded dependency
-rwxr-xr-xci/travis-install.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/ci/travis-install.sh b/ci/travis-install.sh
index f76d5d40..b6895e82 100755
--- a/ci/travis-install.sh
+++ b/ci/travis-install.sh
@@ -7,7 +7,6 @@ case "$TRAVIS_OS_NAME" in
# Architecture-dependent packages.
pkgs=(
libaio-dev
- libcunit1
libcunit1-dev
libfl-dev
libgoogle-perftools-dev
@@ -21,7 +20,10 @@ case "$TRAVIS_OS_NAME" in
case "$CI_TARGET_ARCH" in
"x86")
pkgs=("${pkgs[@]/%/:i386}")
- pkgs+=(gcc-multilib)
+ pkgs+=(
+ gcc-multilib
+ pkg-config:i386
+ )
;;
"amd64")
pkgs+=(nvidia-cuda-dev)