diff options
| author | Alexander Færøy <ahf@torproject.org> | 2020-07-07 14:48:35 +0000 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2020-07-07 14:48:35 +0000 |
| commit | 19d579e8cbb7bd95ed4fd50697c689ab7b725963 (patch) | |
| tree | b141c082d9aa3792c1e10939d1b47215b70f0e6c | |
| parent | 07d8d398ca8961d2d9155a2df9c7ced6b382e73b (diff) | |
| parent | d9cc2b2928eab045f89d0abf95a9e5c75e290ff8 (diff) | |
| download | tor-19d579e8cbb7bd95ed4fd50697c689ab7b725963.tar.gz tor-19d579e8cbb7bd95ed4fd50697c689ab7b725963.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.2
| -rw-r--r-- | .appveyor.yml | 2 | ||||
| -rw-r--r-- | changes/ticket40026 | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 461eacb4a9..03cf2f69f6 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -87,7 +87,7 @@ build_script: # mingw zstd doesn't come with a pkg-config file, so we manually # configure its flags. liblzma just works. #> - Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --with-openssl-dir=/${env:compiler_path} --disable-asciidoc --enable-fatal-warnings ${env:hardening}" + Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --with-openssl-dir=/${env:compiler_path} --disable-asciidoc --enable-fatal-warnings ${env:hardening} CFLAGS='-D__USE_MINGW_ANSI_STDIO=0'" Execute-Bash "V=1 make -k -j2" Execute-Bash "V=1 make -k -j2 install" } diff --git a/changes/ticket40026 b/changes/ticket40026 new file mode 100644 index 0000000000..f87c2964e0 --- /dev/null +++ b/changes/ticket40026 @@ -0,0 +1,3 @@ + o Minor bugfix (CI, Windows): + - Don't use stdio 64 bit printf format when compiling with MINGW on + Appveyor. Fixes bug 40026; bugfix on 0.3.5.5-alpha. |