travis: fix x86 libiscsi detection
authorSitsofe Wheeler <sitsofe@yahoo.com>
Sun, 26 Jul 2020 19:48:59 +0000 (20:48 +0100)
committerSitsofe Wheeler <sitsofe@yahoo.com>
Sun, 26 Jul 2020 20:02:58 +0000 (21:02 +0100)
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>
ci/travis-install.sh

index c7b6669e30a853f87819ff5ba2fb0d64fd13cc3e..b6895e82cb98daecc22b8eb1fba32a0540312598 100755 (executable)
@@ -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)