diff --git a/bootstrap.sh b/bootstrap.sh index ec13fdd669..6254f8d5f1 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -380,6 +380,23 @@ bootstrap_fs() { rm -rf autom4te*.cache } +bootstrap_libs_pre() { + case "$i" in + ldns) + # This file shouldn't even be in the tree as it's autogenerated + # during bootstrap, but some people report it breaks the build + # if it's not there. Let's prevent it from getting accidentally + # updated. + (cd $BASEDIR/libs/ldns && cp -a install-sh install-sh~) ;; + esac +} + +bootstrap_libs_post() { + case "$i" in + ldns) (cd $BASEDIR/libs/ldns && mv install-sh~ install-sh) ;; + esac +} + bootstrap_libs() { for i in ${SUBDIRS}; do case "$i" in @@ -389,11 +406,13 @@ bootstrap_libs() { continue ;; esac + bootstrap_libs_pre if ! ${BGJOB}; then libbootstrap ${i} else libbootstrap ${i} & fi + bootstrap_libs_post done }