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 crosscompile to windows uses builtin ldns not host ldns.

Browse source 
git-svn-id: file:///svn/unbound/trunk@2151 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2010-06-15 09:57:34 +00:00
parent d7fec82eaa
commit 75c811cc35
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Changelog
View file

@ -3,6 +3,7 @@
- trunk contains 1.4.6 in development. - trunk contains 1.4.6 in development.
- Fix TCPreply on systems with no writev, if just 1 byte could be sent. - Fix TCPreply on systems with no writev, if just 1 byte could be sent.
- Fix to use one pointer less for iterator query state store_parent_NS. - Fix to use one pointer less for iterator query state store_parent_NS.
- makedist crosscompile to windows uses builtin ldns not host ldns.
11 June 2010: Wouter 11 June 2010: Wouter
- When retry to parent the retrycount is not wiped, so failed - When retry to parent the retrycount is not wiped, so failed

9
makedist.sh
View file

@ -168,13 +168,15 @@ while [ "$1" ]; do
done done
if [ "$DOWIN" = "yes" ]; then if [ "$DOWIN" = "yes" ]; then
# detect crosscompile, from Fedora11 at this point. # detect crosscompile, from Fedora13 at this point.
if test "`uname`" = "Linux"; then if test "`uname`" = "Linux"; then
info "Crosscompile windows dist" info "Crosscompile windows dist"
cross="yes" cross="yes"
configure="mingw32-configure" configure="mingw32-configure"
strip="i686-pc-mingw32-strip" strip="i686-pc-mingw32-strip"
makensis="makensis" # from mingw32-nsis package makensis="makensis" # from mingw32-nsis package
# in crosscompile no installed ldns, use builtin (not linux-ldns)
cross_flag="--with-ldns-builtin"
check_svn_root check_svn_root
create_temp_dir create_temp_dir
@ -186,6 +188,7 @@ if [ "$DOWIN" = "yes" ]; then
if test -f mingw32-config.cache; then rm mingw32-config.cache; fi if test -f mingw32-config.cache; then rm mingw32-config.cache; fi
else else
cross="no" # mingw and msys cross="no" # mingw and msys
cross_flag=""
configure="./configure" configure="./configure"
strip="strip" strip="strip"
makensis="c:/Program Files/NSIS/makensis.exe" # http://nsis.sf.net makensis="c:/Program Files/NSIS/makensis.exe" # http://nsis.sf.net
@ -213,8 +216,8 @@ if [ "$DOWIN" = "yes" ]; then
# procedure for making unbound installer on mingw. # procedure for making unbound installer on mingw.
info "Creating windows dist unbound $version" info "Creating windows dist unbound $version"
info "Calling configure" info "Calling configure"
echo "$configure"' --enable-debug --enable-static-exe '"$*" echo "$configure"' --enable-debug --enable-static-exe '"$* $cross_flag"
$configure --enable-debug --enable-static-exe $* \ $configure --enable-debug --enable-static-exe $* $cross_flag \
|| error_cleanup "Could not configure" || error_cleanup "Could not configure"
info "Calling make" info "Calling make"
make || error_cleanup "Could not make" make || error_cleanup "Could not make"