upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- makedist fix for windows binaries, with openssl 1.1.0 windres fix,

Browse source 
and expat 2.2.4 install target fix.


git-svn-id: file:///svn/unbound/trunk@4336 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2017-09-04 14:02:15 +00:00
parent 03d62b2e43
commit 0fcc88689d
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/Changelog
View file

@ -1,5 +1,7 @@
4 September 2017: Wouter 4 September 2017: Wouter
- tag 1.6.6rc1 - tag 1.6.6rc1
- makedist fix for windows binaries, with openssl 1.1.0 windres fix,
and expat 2.2.4 install target fix.
1 September 2017: Wouter 1 September 2017: Wouter
- Recommend 1472 buffer size in unbound.conf - Recommend 1472 buffer size in unbound.conf

6
makedist.sh
View file

@ -259,7 +259,7 @@ if [ "$DOWIN" = "yes" ]; then
sslflags="no-asm -DOPENSSL_NO_CAPIENG mingw" sslflags="no-asm -DOPENSSL_NO_CAPIENG mingw"
fi fi
info "winssl: Configure $sslflags" info "winssl: Configure $sslflags"
CC=${warch}-w64-mingw32-gcc AR=${warch}-w64-mingw32-ar RANLIB=${warch}-w64-mingw32-ranlib ./Configure --prefix="$sslinstall" $sslflags || error_cleanup "OpenSSL Configure failed" CC=${warch}-w64-mingw32-gcc AR=${warch}-w64-mingw32-ar RANLIB=${warch}-w64-mingw32-ranlib WINDRES=${warch}-w64-mingw32-windres ./Configure --prefix="$sslinstall" $sslflags || error_cleanup "OpenSSL Configure failed"
info "winssl: make" info "winssl: make"
make || error_cleanup "OpenSSL crosscompile failed" make || error_cleanup "OpenSSL crosscompile failed"
# only install sw not docs, which take a long time. # only install sw not docs, which take a long time.
@ -279,8 +279,8 @@ if [ "$DOWIN" = "yes" ]; then
$configure --prefix="$wxpinstall" --exec-prefix="$wxpinstall" --bindir="$wxpinstall/bin" --includedir="$wxpinstall/include" --mandir="$wxpinstall/man" --libdir="$wxpinstall/lib" || error_cleanup "libexpat configure failed" $configure --prefix="$wxpinstall" --exec-prefix="$wxpinstall" --bindir="$wxpinstall/bin" --includedir="$wxpinstall/include" --mandir="$wxpinstall/man" --libdir="$wxpinstall/lib" || error_cleanup "libexpat configure failed"
#info "wxp: make" #info "wxp: make"
#make || error_cleanup "libexpat crosscompile failed" #make || error_cleanup "libexpat crosscompile failed"
info "wxp: make installlib" info "wxp: make install"
make installlib || error_cleanup "libexpat install failed" make install || error_cleanup "libexpat install failed"
cross_flag="$cross_flag --with-libexpat=$wxpinstall" cross_flag="$cross_flag --with-libexpat=$wxpinstall"
cd .. cd ..
fi fi