The branch master has been updated
via 7d1037661afedc008f0abbd050c492e23905b431 (commit)
from d1776fdecd6a8677a281a85498a74a8480739689 (commit)
- Log -----------------------------------------------------------------
commit 7d1037661afedc008f0abbd050c492e23905b431
Author: Richard Levitte <[email protected]>
Date: Thu Feb 18 11:02:42 2016 +0100
Fix the makedepend constructor in unix-Makefile.tmpl
Reviewed-by: Rich Salz <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Configurations/unix-Makefile.tmpl | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/Configurations/unix-Makefile.tmpl
b/Configurations/unix-Makefile.tmpl
index 9cbab43..bae16fd 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -126,6 +126,7 @@ NM= $(CROSS_COMPILE){- $target{nm} || "nm" -}
RM= rm -f
TAR= {- $target{tar} || "tar" -}
TARFLAGS= {- $target{tarflags} -}
+MAKEDEPEND=$(CROSS_COMPILE){- $config{makedepprog} -}
BASENAME= openssl
NAME= $(BASENAME)-$(VERSION)
@@ -180,7 +181,7 @@ clean: libclean
-rm -f `find $(BLDDIR) -type l`
rm -f $(TARFILE)
-DCLEAN_CMD=sed -e '/^DO NOT DELETE.*/,$$d'
+DCLEAN_CMD=sed -e '/^. DO NOT DELETE.*/,$$d'
dclean:
$(DCLEAN_CMD) < Makefile >Makefile.new
mv -f Makefile.new Makefile
@@ -743,10 +744,11 @@ Makefile: {- $config{build_file_template} -}
$(SRCDIR)/Configure $(SRCDIR)/confi
return <<"EOF";
$dep : $deps
rm -f \$\@.tmp; touch \$\@.tmp
- \$(MAKEDEPEND) -f\$\@.tmp -o"|$obj"\
- -- -DOPENSSL_DOING_MAKEDEPEND \$(DEPFLAGS)$incs \
- -- $srcs
- sed -e 's/^.*|//' -e 's/ \\/\\(\\\\.\\|[^ ]\\)*//g' -e '/: *\$/d' -e
'/^\\(#.*\\| *\\)\$/d' \$\@.tmp > \$\@
+ \$(MAKEDEPEND) -f\$\@.tmp -o"|$obj" \\
+ -- -DOPENSSL_DOING_MAKEDEPEND \$(DEPFLAGS)$incs \\
+ -- $srcs \\
+ 2>/dev/null
+ sed -e 's/^.*|//' -e 's/ \\/\\(\\\\.\\|[^ ]\\)*//g' -e '/: *\$\$/d' -e
'/^\\(#.*\\| *\\)\$\$/d' \$\@.tmp > \$\@
rm \$\@.tmp
EOF
}
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
