From: Sitsofe Wheeler <sitsofe@yahoo.com>
Date: Sun, 26 Jul 2020 19:48:59 +0000 (+0100)
Subject: travis: fix x86 libiscsi detection
X-Git-Tag: fio-3.22~20^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7a64f9e42026cdac5efbbe4a605917de3467fae3;p=fio.git

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>
---

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)