Merge remote-tracking branch 'upstream/develop' into release/1.1.0-alpha3

This commit is contained in:
Willem Toorop 2016-11-03 14:27:50 +01:00
commit 258e59242b
1 changed files with 13 additions and 12 deletions

View File

@ -261,29 +261,30 @@ The build has been tested using the following:
32 bit only Mingw: [Mingw(3.21.0) and Msys 1.0](http://www.mingw.org/) on Windows 8.1 32 bit only Mingw: [Mingw(3.21.0) and Msys 1.0](http://www.mingw.org/) on Windows 8.1
32 bit build on a 64 bit Mingw [Download latest from: http://mingw-w64.org/doku.php/download/mingw-builds and http://msys2.github.io/]. IMPORTANT: Install tested ONLY on the "x86_64" for 64-bit installer of msys2. 32 bit build on a 64 bit Mingw [Download latest from: http://mingw-w64.org/doku.php/download/mingw-builds and http://msys2.github.io/]. IMPORTANT: Install tested ONLY on the "x86_64" for 64-bit installer of msys2.
Dependencies: #### Dependencies:
The following dependencies are The following dependencies are
openssl-1.0.2e * openssl-1.0.2j
libidn * libidn
Instructions to build openssl-1.0.2e: Instructions to build openssl-1.0.2j:
Open the mingw32_shell.bat from msys2 in order to build: Open the mingw32_shell.bat from msys2 in order to build:
If necessary, install the following using pacman: If necessary, install the following using pacman:
pacman -S pkg-config libtool automake
pacman -S autoconf automake-wrapper
tar -xvf openssl-1.0.2e.tar pacman -S pkg-config libtool automake
cd openssl-1.0.2e/ pacman -S autoconf automake-wrapper
./Configure --prefix=${LOCALDESTDIR} --openssldir=${LOCALDESTDIR}/etc/ssl --libdir=lib shared zlib-dynamic mingw
make tar -xvf openssl-1.0.2j.tar
make install cd openssl-1.0.2j/
./Configure --prefix=${LOCALDESTDIR} --openssldir=${LOCALDESTDIR}/etc/ssl --libdir=lib shared zlib-dynamic mingw
make
make install
To configure: To configure:
./configure --enable-stub-only --with-trust-anchor="c:\\\MinGW\\\msys\\\1.0\\\etc\\\unbound\\\getdns-root.key" --with-ssl=<location of openssl from above> --with-getdns_query ./configure --enable-stub-only --with-trust-anchor="c:\\\MinGW\\\msys\\\1.0\\\etc\\\unbound\\\getdns-root.key" --with-ssl=<location of openssl from above> --with-getdns_query
The trust anchor is also installed by unbound on c:\program Files (X86)\unbound\root.key and can be referenced from there The trust anchor is also installed by unbound on `c:\program Files (X86)\unbound\root.key` and can be referenced from there
or anywhere else that the user chooses to configure it. or anywhere else that the user chooses to configure it.
After configuring, do a `make` and `make install` to build getdns for Windows. After configuring, do a `make` and `make install` to build getdns for Windows.