summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSitsofe Wheeler <sitsofe@yahoo.com>2020-07-26 20:48:59 +0100
committerSitsofe Wheeler <sitsofe@yahoo.com>2020-07-26 21:02:58 +0100
commit7a64f9e42026cdac5efbbe4a605917de3467fae3 (patch)
treeb7ad891b2cb7c40f7fab303c28920406d0aa98b7
parent830c71d749176ecd881d386ea8d7941ed2337d96 (diff)
downloadfio-7a64f9e42026cdac5efbbe4a605917de3467fae3.tar.gz
fio-7a64f9e42026cdac5efbbe4a605917de3467fae3.tar.bz2
travis: fix x86 libiscsi detection
When cross compiling to 32 bit systems, pkg-config has to find 32 bit libraries. This can be done by one of the following - Setting PKG_CONFIG_PATH/PKG_CONFIG_LIBDIR to an appropriate directory - Using a 32 bit pkg-config binary Choose the later for now by installing a 32 bit pkg-config (which will replace the 64 bit one). This should fix failing CI on the 32 bit x86 build. Signed-off-by: Sitsofe Wheeler <sitsofe@yahoo.com>
-rwxr-xr-xci/travis-install.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/ci/travis-install.sh b/ci/travis-install.sh
index c7b6669e..b6895e82 100755
--- a/ci/travis-install.sh
+++ b/ci/travis-install.sh
@@ -20,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)