[openssl.org #1963] [PATCH 01/14] Build should fail if makedepend is not present.
If makedepend fails (for example, if it isn't in the path), then domd
should fail so the build can stop on the error.
Overview : http://www.mail-archive.com/openssl-dev@openssl.org/msg26096.html
--
David McCullough, david_mccullo...@securecomputing.com, Ph:+61 734352815
McAfee - SnapGear http://www.snapgear.comhttp://www.uCdot.org
diff --git a/util/domd b/util/domd
index 27c0211..bab48cb 100755
--- a/util/domd
+++ b/util/domd
@@ -22,13 +22,17 @@ if expr $MAKEDEPEND : '.*gcc$' /dev/null; then
done
sed -e '/^# DO NOT DELETE.*/,$d' Makefile Makefile.tmp
echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' Makefile.tmp
-${MAKEDEPEND} -Werror -D OPENSSL_DOING_MAKEDEPEND -M $args Makefile.tmp || exit
+${MAKEDEPEND} -Werror -D OPENSSL_DOING_MAKEDEPEND -M $args Makefile.tmp || exit 1
${PERL} $TOP/util/clean-depend.pl Makefile.tmp Makefile.new
+RC=$?
rm -f Makefile.tmp
else
-${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND $@
+${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND $@ \
${PERL} $TOP/util/clean-depend.pl Makefile Makefile.new
+RC=$?
fi
mv Makefile.new Makefile
# unfake the presence of Kerberos
rm $TOP/krb5.h
+
+exit $RC
[PATCH 01/14] Build should fail if makedepend is not present.
If makedepend fails (for example, if it isn't in the path), then domd
should fail so the build can stop on the error.
---
util/domd |8 ++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/util/domd b/util/domd
index 27c0211..bab48cb 100755
--- a/util/domd
+++ b/util/domd
@@ -22,13 +22,17 @@ if expr $MAKEDEPEND : '.*gcc$' /dev/null; then
done
sed -e '/^# DO NOT DELETE.*/,$d' Makefile Makefile.tmp
echo '# DO NOT DELETE THIS LINE -- make depend depends on it.'
Makefile.tmp
-${MAKEDEPEND} -Werror -D OPENSSL_DOING_MAKEDEPEND -M $args Makefile.tmp
|| exit
+${MAKEDEPEND} -Werror -D OPENSSL_DOING_MAKEDEPEND -M $args Makefile.tmp
|| exit 1
${PERL} $TOP/util/clean-depend.pl Makefile.tmp Makefile.new
+RC=$?
rm -f Makefile.tmp
else
-${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND $@
+${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND $@ \
${PERL} $TOP/util/clean-depend.pl Makefile Makefile.new
+RC=$?
fi
mv Makefile.new Makefile
# unfake the presence of Kerberos
rm $TOP/krb5.h
+
+exit $RC
--
David McCullough, david_mccullo...@securecomputing.com, Ph:+61 734352815
McAfee - SnapGear http://www.snapgear.comhttp://www.uCdot.org
__
OpenSSL Project http://www.openssl.org
Development Mailing List openssl-dev@openssl.org
Automated List Manager majord...@openssl.org
