diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-11-27 12:03:50 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-11-27 12:03:50 -0500 |
| commit | 72c1303cef629576cb8d078590ed71091828fd78 (patch) | |
| tree | fedde4f4382d0e185c0e6a01abc4774e8891816b | |
| parent | feb41b7c3078d6df7e93a056853badc847773d9a (diff) | |
| parent | 36c32355349bff091b92c04be2823d96feebd5c6 (diff) | |
| download | tor-72c1303cef629576cb8d078590ed71091828fd78.tar.gz tor-72c1303cef629576cb8d078590ed71091828fd78.zip | |
Merge branch 'maint-0.3.4' into maint-0.3.5
| -rw-r--r-- | .appveyor.yml | 4 | ||||
| -rw-r--r-- | changes/ticket28574 | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 18097f8881..837cded43c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -40,7 +40,7 @@ install: # # Use pacman --debug to show package downloads and install locations #> - Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed --noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl ${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ; + Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed --noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ; build_script: - ps: >- @@ -60,7 +60,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} --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}" Execute-Bash "V=1 make -j2" Execute-Bash "V=1 make -j2 install" } diff --git a/changes/ticket28574 b/changes/ticket28574 new file mode 100644 index 0000000000..562810f511 --- /dev/null +++ b/changes/ticket28574 @@ -0,0 +1,4 @@ + o Minor bugfixes (continuous integration, Windows): + - Explicitly specify the path to the OpenSSL library and do not download + OpenSSL from Pacman, but instead use the library that is already provided + by AppVeyor. Fixes bug 28574; bugfix on master. |