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

Updated Windows agents for PCRE2 library

Browse Source
This commit is contained in:
dotneft
2022-01-22 01:56:51 +05:00
parent 3b6368f7c9
commit f6340c05b5
4 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,8 +41,8 @@ RUN Set-Location -Path $env:SystemDrive\.; `
nmake /S -f Makefile `
CPU=$env:CPU_MODEL `
CFLAGS="""/D ZABBIX_VERSION_REVISION=$ZbxRevision /D HAVE_LIBMODBUS_STATIC""" `
PCREINCDIR=$env:SystemDrive\pcre_build\build `
PCRELIBDIR=$env:SystemDrive\pcre_build\build\Release TLS=openssl `
PCRE2INCDIR=$env:SystemDrive\pcre2_build\build `
PCRE2LIBDIR=$env:SystemDrive\pcre2_build\build\Release TLS=openssl `
RFLAGS="""/D ZABBIX_VERSION_REVISION=$ZbxRevision /D ZABBIX_VERSION_RC_NUM=$env:ZABBIX_VERSION_RC_NUM""" `
# LIBS="Crypt32.lib" `
TLSINCDIR=$env:SystemDrive\openssl_output\include `

4
Dockerfiles/build-mysql/windows/Dockerfile.agent2
View File

@@ -38,8 +38,8 @@ RUN Set-Location -Path $env:SystemDrive\.; `
(Get-Content src\go\pkg\version\version.go).replace('{ZABBIX_REVISION}', $ZbxRevision) | Set-Content src\go\pkg\version\version.go; `
Set-Location -Path $env:SystemDrive\zabbix-$env:ZBX_VERSION\build\mingw; `
mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" `
# CGO_LDFLAGS="""-lssl -lcrypto -lcrypt32 -L$env:SystemDrive\openssl_output\lib -L$env:SystemDrive\pcre_output\lib""" `
PCRE=$env:SystemDrive\pcre_output `
# CGO_LDFLAGS="""-lssl -lcrypto -lcrypt32 -L$env:SystemDrive\openssl_output\lib -L$env:SystemDrive\pcre2_output\lib""" `
PCRE2=$env:SystemDrive\pcre2_output `
OPENSSL=$env:SystemDrive\openssl_output `
RFLAGS="""-DZABBIX_VERSION_RC_NUM=$env:ZABBIX_VERSION_RC_NUM"""; `
`