]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Appveyor: remove incorrect OpenSSL path
authorteor <teor@torproject.org>
Thu, 15 Nov 2018 04:32:53 +0000 (14:32 +1000)
committerteor <teor@torproject.org>
Thu, 15 Nov 2018 09:23:33 +0000 (19:23 +1000)
Fixes 28399 on 0.3.4.1-alpha.

.appveyor.yml
changes/bug28399 [new file with mode: 0644]

index 4069a5396638749931c7dad1a66fdf6762c94d5b..fdf831686a4043cb10f2156ea2553f50e64ec637 100644 (file)
@@ -8,12 +8,10 @@ environment:
   matrix:
   - target: i686-w64-mingw32
     compiler_path: mingw32
-    openssl_path: /c/OpenSSL-Win32
     mingw_prefix: mingw-w64-i686
     hardening:
   - target: x86_64-w64-mingw32
     compiler_path: mingw64
-    openssl_path: /c/OpenSSL-Win64
     mingw_prefix: mingw-w64-x86_64
     hardening: --disable-gcc-hardening
 
@@ -45,7 +43,7 @@ build_script:
             Set-Location "${env:build}"
             Execute-Bash "which ${env:target}-gcc"
             Execute-Bash "${env:target}-gcc --version"
-            Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings --with-openssl-dir=${env:openssl_path} ${env:hardening}"
+            Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings ${env:hardening}"
             Execute-Bash "V=1 make -j2"
             Execute-Bash "V=1 make -j2 install"
      }
diff --git a/changes/bug28399 b/changes/bug28399
new file mode 100644 (file)
index 0000000..9096db7
--- /dev/null
@@ -0,0 +1,4 @@
+  o Minor bugfixes (continuous integration, Windows):
+    - Stop using an external OpenSSL install, and stop installing MSYS2
+      packages, when building using mingw on Appveyor Windows CI.
+      Fixes bug 28399; bugfix on 0.3.4.1-alpha.