Odds and sods

conda-forge · Apr 18, 2020 · 33c1038 · 33c1038
1 parent f539bb7
commit 33c1038
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/recipe/bld.bat b/recipe/bld.bat
@@ -73,7 +73,13 @@ if errorlevel 1 exit /b 1
 :: ctest -C Release
 :: if errorlevel 1 exit 1
 
-:: Win 32-bit seems to want to run the wrong zlib DLL
+:: Windows 32-bit seems to want to run the wrong zlib DLL
+:: We have 2 zlib-1.2.11 build #3 for win-64:
+:: zlib-1.2.11-h3cc03e0_3.tar.bz2	120 KB	2018-11-21 15:50:01 +0000	928fa9aa513a1d08016a4079e2c52706a3fd29a5f2acd16eabec5e8ab9599478	774d60f873e10acc14be0d239c18d614
+:: zlib-1.2.11-h62dcd97_3.tar.bz2	128 KB	2018-11-21 15:46:22 +0000	3a5148e6b79ae0ec581df96d97d248d38366db49109f1726eda76639551745be	6f96fd91475cc78aabf76d2e1a9ed91f
+:: https://repo.anaconda.com/pkgs/main/win-64/zlib-1.2.11-h3cc03e0_3.tar.bz2
+:: https://repo.anaconda.com/pkgs/main/win-64/zlib-1.2.11-h62dcd97_3.tar.bz2
+
 :: Test extracting a 7z. This failed due to not using the multi-threaded DLL runtime, fixed by 0009-CMake-Force-Multi-threaded-DLL-runtime.patch
 :: %BUILD_PREFIX%\Library\bin\curl.exe -SLO http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_12_0_rc2.7z
 :: powershell -command "& { (New-Object Net.WebClient).DownloadFile('http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_12_0_rc2.7z', 'opengl32sw-64-mesa_12_0_rc2.7z') }"
@@ -84,6 +90,7 @@ if errorlevel 1 exit /b 1
 echo Trying to run %LIBRARY_BIN%\bsdcat.exe --version
 %LIBRARY_BIN%\bsdcat.exe --version
 if errorlevel 1 exit 1
+
 echo Trying to run %LIBRARY_BIN%\bsdcpio.exe --version
 %LIBRARY_BIN%\bsdcpio.exe --version
 if errorlevel 1 exit 1