Added ensure_xz instead of always skipping on manylinux

docker_build_wrap.sh

@@ -23,10 +23,10 @@ ENV_VARS_PATH=${ENV_VARS_PATH:-env_vars.sh}
 # Always pull in common and library builder utils
 MULTIBUILD_DIR=$(dirname "${BASH_SOURCE[0]}")
 # These routines also source common_utils.sh
+source $MULTIBUILD_DIR/manylinux_utils.sh
 if [ -r "$ENV_VARS_PATH" ]; then source "$ENV_VARS_PATH"; fi
 source $MULTIBUILD_DIR/configure_build.sh
 source $MULTIBUILD_DIR/library_builders.sh
-source $MULTIBUILD_DIR/manylinux_utils.sh
 
 if [ "$USE_CCACHE" == "1" ]; then
     activate_ccache

library_builders.sh

@@ -148,7 +148,7 @@ function build_bzip2 {
 function build_tiff {
     build_zlib
     build_jpeg
-    build_xz
+    ensure_xz
     build_simple tiff $TIFF_VERSION https://download.osgeo.org/libtiff
 }
 
@@ -201,6 +201,12 @@ function build_xz {
     build_simple xz $XZ_VERSION https://tukaani.org/xz
 }
 
+function ensure_xz {
+	if [[ ! $(type -P "xz") ]]; then
+		build_xz
+	fi
+}
+
 function build_libwebp {
     build_libpng
     build_tiff

manylinux_utils.sh

@@ -4,10 +4,6 @@
 MULTIBUILD_DIR=$(dirname "${BASH_SOURCE[0]}")
 source $MULTIBUILD_DIR/common_utils.sh
 
-function build_xz {
-	echo "Skip building xz"
-}
-
 function get_platform {
     # Report platform as given by uname
     python -c 'import platform; print(platform.uname()[4])'

tests/test_library_builders.sh

@@ -40,7 +40,7 @@ suppress build_flex
 suppress build_openblas
 suppress build_tiff
 suppress build_lcms2
-suppress build_xz
+suppress ensure_xz
 suppress build_freetype
 suppress build_libyaml
 if [ -z "$IS_OSX" ]; then