Azure CI Windows: Upgrade bundled libcurl to v7.74.0#3638
Merged
kinke merged 1 commit intoldc-developers:masterfrom Jan 8, 2021
Merged
Azure CI Windows: Upgrade bundled libcurl to v7.74.0#3638kinke merged 1 commit intoldc-developers:masterfrom
kinke merged 1 commit intoldc-developers:masterfrom
Conversation
Build steps:
- Build zlib v1.2.11 using contrib\vstudio\vc14\zlibvc.sln (static
release lib incl. asm, which needs to be built separately, e.g.,
`cd contrib\masmx64 && bld_ml64.bat` - I've added `/safeseh` in
contrib\masmx86\bld_ml32.bat).
MSCRT was set to /MT, and `/GS- /Zl` used for MinGW-based libs
compatibility.
Includes ({zconf,zlib}.h) and lib (zlibstat.{lib,pdb}) copied to
C:\LDC\curl-7.74.0\deps[_x86].
- Patch winbuild\MakefileBuild.vc:
- Extend CFLAGS by `/DDONT_USE_RECV_BEFORE_SEND_WORKAROUND`.
- Extend CFLAGS_LIBCURL_STATIC by `/GS- /Zl` (for MinGW-based libs compatibility...).
- Build DLL + import lib + .exp file:
nmake /f Makefile.vc mode=dll VC=16 WITH_DEVEL=C:\LDC\curl-7.74.0\deps[_x86] WITH_ZLIB=static GEN_PDB=no DEBUG=no MACHINE=x{64,86} RTLIBCFG=static
- Build static lib:
nmake /f Makefile.vc mode=static VC=16 WITH_DEVEL=C:\LDC\curl-7.74.0\deps[_x86] WITH_ZLIB=static GEN_PDB=no DEBUG=no MACHINE=x{64,86} RTLIBCFG=static
- Strip `lib` prefix from `libcurl*.{lib,exp}` filenames.
Member
Author
|
Primary motivation: #3472 The current VirusTotal results seem promising: x64 (0/70) and x86 (1/70 - flagged by This time, I've also rebuilt the static zlib library (using VS 2019 v16.8.3), adding |
kinke
added a commit
to kinke/ldc
that referenced
this pull request
Feb 1, 2021
…3638) Build steps: - Build zlib v1.2.11 using contrib\vstudio\vc14\zlibvc.sln (static release lib incl. asm, which needs to be built separately, e.g., `cd contrib\masmx64 && bld_ml64.bat` - I've added `/safeseh` in contrib\masmx86\bld_ml32.bat). MSCRT was set to /MT, and `/GS- /Zl` used for MinGW-based libs compatibility. Includes ({zconf,zlib}.h) and lib (zlibstat.{lib,pdb}) copied to C:\LDC\curl-7.74.0\deps[_x86]. - Patch winbuild\MakefileBuild.vc: - Extend CFLAGS by `/DDONT_USE_RECV_BEFORE_SEND_WORKAROUND`. - Extend CFLAGS_LIBCURL_STATIC by `/GS- /Zl` (for MinGW-based libs compatibility...). - Build DLL + import lib + .exp file: nmake /f Makefile.vc mode=dll VC=16 WITH_DEVEL=C:\LDC\curl-7.74.0\deps[_x86] WITH_ZLIB=static GEN_PDB=no DEBUG=no MACHINE=x{64,86} RTLIBCFG=static - Build static lib: nmake /f Makefile.vc mode=static VC=16 WITH_DEVEL=C:\LDC\curl-7.74.0\deps[_x86] WITH_ZLIB=static GEN_PDB=no DEBUG=no MACHINE=x{64,86} RTLIBCFG=static - Strip `lib` prefix from `libcurl*.{lib,exp}` filenames.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Build steps:
contrib\vstudio\vc14\zlibvc.sln(static release lib incl. asm, which needs to be built separately, e.g.,cd contrib\masmx64 && bld_ml64.bat- I've added/safesehincontrib\masmx86\bld_ml32.bat).MSCRT was set to
/MT, and/GS- /Zlused for MinGW-based libs compatibility.Includes (
{zconf,zlib}.h) and lib (zlibstat.{lib,pdb}) copied toC:\LDC\curl-7.74.0\deps[_x86].winbuild\MakefileBuild.vc:CFLAGSby/DDONT_USE_RECV_BEFORE_SEND_WORKAROUND.CFLAGS_LIBCURL_STATICby/GS- /Zl(for MinGW-based libs compatibility...).nmake /f Makefile.vc mode=dll VC=16 WITH_DEVEL=C:\LDC\curl-7.74.0\deps[_x86] WITH_ZLIB=static GEN_PDB=no DEBUG=no MACHINE=x{64,86} RTLIBCFG=staticnmake /f Makefile.vc mode=static VC=16 WITH_DEVEL=C:\LDC\curl-7.74.0\deps[_x86] WITH_ZLIB=static GEN_PDB=no DEBUG=no MACHINE=x{64,86} RTLIBCFG=staticlibprefix fromlibcurl*.{lib,exp}filenames.