Merge pull request #266 from SimonRit/WheelExclude

Author: dzenanz

scripts/dockcross-manylinux-build-module-wheels.sh

@@ -61,12 +61,18 @@ chmod 777 $(pwd)/tools
 mkdir -p dist
 DOCKER_ARGS="-v $(pwd)/dist:/work/dist/ -v ${script_dir}/..:/ITKPythonPackage -v $(pwd)/tools:/tools"
 DOCKER_ARGS+=" -e MANYLINUX_VERSION"
+DOCKER_ARGS+=" -e LD_LIBRARY_PATH"
 # Mount any shared libraries
 if [[ -n ${LD_LIBRARY_PATH} ]]; then
   for libpath in ${LD_LIBRARY_PATH//:/ }; do
-	  DOCKER_ARGS+=" -v ${libpath}:/usr/lib64/$(basename -- ${libpath})"
+          DOCKER_LIBRARY_PATH="/usr/lib64/$(basename -- ${libpath})"
+          DOCKER_ARGS+=" -v ${libpath}:${DOCKER_LIBRARY_PATH}"
+          if test -d ${libpath}; then
+              DOCKER_LD_LIBRARY_PATH+="${DOCKER_LIBRARY_PATH}:${DOCKER_LD_LIBRARY_PATH}"
+          fi
   done
 fi
+export LD_LIBRARY_PATH="${DOCKER_LD_LIBRARY_PATH}"
 
 if [[ "${TARGET_ARCH}" = "aarch64" ]]; then
   echo "Install aarch64 architecture emulation tools to perform build for ARM platform"

scripts/internal/auditwheel_whitelist_monkeypatch.py

@@ -122,13 +122,14 @@ for PYBIN in "${PYBINARIES[@]}"; do
     || exit 1
 done
 
-# Make sure auditwheel is installed for this python exe before importing
-# it in auditwheel_whitelist_monkeypatch.py
+# Convert list of excluded libs in --exclude_libs to auditwheel --exclude options
+if test -n "$EXCLUDE_LIBS"; then
+  AUDITWHEEL_EXCLUDE_ARGS="--exclude ${EXCLUDE_LIBS//;/ --exclude }"
+fi
+
 sudo ${Python3_EXECUTABLE} -m pip install auditwheel
 for whl in dist/*linux*$(uname -m).whl; do
-  # Repair wheel using monkey patch to exclude shared libraries provided in whitelist
-  ${Python3_EXECUTABLE} "${script_dir}/auditwheel_whitelist_monkeypatch.py" \
-    repair ${whl} -w /work/dist/ --whitelist "${EXCLUDE_LIBS}"
+  auditwheel repair ${whl} -w /work/dist/ ${AUDITWHEEL_EXCLUDE_ARGS} 
   rm ${whl}
 done