Repository: thrift Updated Branches: refs/heads/master 2d65c2365 -> a105450fd
THRIFT-4158: MSYS-appveyor-install.bat: use mingw-w64-xxx variants of openssl and zlib Client: C++ This closes #1247 Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/a105450f Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/a105450f Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/a105450f Branch: refs/heads/master Commit: a105450fd1f85ca40423b7f81e9c49386444d429 Parents: 2d65c23 Author: Mario Emmenlauer <ma...@emmenlauer.de> Authored: Fri Apr 7 21:26:52 2017 +0200 Committer: James E. King, III <jk...@apache.org> Committed: Tue Apr 18 09:11:06 2017 -0400 ---------------------------------------------------------------------- build/appveyor/MSYS-appveyor-install.bat | 4 ++-- build/cmake/README-MSYS2.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/a105450f/build/appveyor/MSYS-appveyor-install.bat ---------------------------------------------------------------------- diff --git a/build/appveyor/MSYS-appveyor-install.bat b/build/appveyor/MSYS-appveyor-install.bat index 252f47d..ff43cd3 100644 --- a/build/appveyor/MSYS-appveyor-install.bat +++ b/build/appveyor/MSYS-appveyor-install.bat @@ -28,11 +28,11 @@ CALL cl_showenv.bat || EXIT /B SET PACKAGES=^ --needed -S bison flex ^ make ^ - openssl openssl-devel ^ mingw-w64-x86_64-boost ^ mingw-w64-x86_64-cmake ^ + mingw-w64-x86_64-openssl ^ mingw-w64-x86_64-toolchain ^ - zlib zlib-devel + mingw-w64-x86_64-zlib :: omitting libevent-devel for now it is version 2.1.4 and doesn't play nice with MinGW http://git-wip-us.apache.org/repos/asf/thrift/blob/a105450f/build/cmake/README-MSYS2.md ---------------------------------------------------------------------- diff --git a/build/cmake/README-MSYS2.md b/build/cmake/README-MSYS2.md index 06c0205..02679e6 100644 --- a/build/cmake/README-MSYS2.md +++ b/build/cmake/README-MSYS2.md @@ -26,9 +26,9 @@ Download and fully upgrade msys2 following the instructions at: Install the necessary toolchain items for C++: - $ pacman -S bison flex openssl openssl-devel \ + $ pacman --needed -S bison flex make mingw-w64-x86_64-openssl \ mingw-w64-x86_64-boost mingw-w64-x86_64-cmake \ - mingw-w64-x86_64-toolchain zlib zlib-devel + mingw-w64-x86_64-toolchain mingw-w64-x86_64-zlib Update your msys2 bash path to include /mingw64/bin by adding a line to your ~/.bash_profiles using this command: @@ -60,4 +60,4 @@ Run the tests (inside thrift-build): ## Tested With -msys2 64-bit 2016-10-26 distribution \ No newline at end of file +msys2 64-bit 2016-10-26 distribution
