extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-04-15 23:08:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed OpenSSL compilation for Agent2 on Windows

Browse Source
This commit is contained in:
dotneft 2022-05-09 14:19:26 +03:00 committed by Alexey Pustovalov
parent 3f33a38b9e
commit 2bd49b03b1
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfiles/build-base/windows/Dockerfile.agent
View File

@ -212,8 +212,8 @@ RUN Set-Location -Path $env:SystemDrive\.; `
--prefix=$env:SystemDrive\openssl_output ` --prefix=$env:SystemDrive\openssl_output `
--openssldir=$env:SystemDrive\openssl_output_ssl; ` --openssldir=$env:SystemDrive\openssl_output_ssl; `
set CL=/MP; ` set CL=/MP; `
nmake /S; ` nmake /S build_sw; `
nmake /S install_sw; ` nmake /S install_dev; `
Write-Host 'OpenSSL is ready...'; Write-Host 'OpenSSL is ready...';
COPY modbus.vs16.vcxproj c:\ COPY modbus.vs16.vcxproj c:\

9
Dockerfiles/build-base/windows/Dockerfile.agent2
View File

@ -242,10 +242,11 @@ RUN Set-Location -Path $env:SystemDrive\.; `
# enable-capieng ` # enable-capieng `
no-capieng ` no-capieng `
--api=1.1.0 ` --api=1.1.0 `
--prefix=$env:SystemDrive\openssl_output ` --libdir=lib `
--openssldir=$env:SystemDrive\openssl_output_ssl; ` --prefix=$env:SystemDrive/openssl_output `
mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS"""; ` --openssldir=$env:SystemDrive/openssl_output_ssl; `
mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" install_sw; ` mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" build_sw; `
mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" install_dev; `
Write-Host 'OpenSSL is ready...'; ` Write-Host 'OpenSSL is ready...'; `
Write-Host 'Removing cygwin...'; ` Write-Host 'Removing cygwin...'; `
Remove-Item -Recurse -Force -Path $env:SystemDrive\cygwin; Remove-Item -Recurse -Force -Path $env:SystemDrive\cygwin;