[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Tue Dec 12 16:22:29 UTC 2017
The branch master has been updated
via ea7df7ea449ef85a163fde917906e6e3da9388e5 (commit)
via fe191b49b3eb1f14afa528b5f64a687488470daa (commit)
from 5f0e171a10325ec4502c2ce41b56d46f3c121fcb (commit)
- Log -----------------------------------------------------------------
commit ea7df7ea449ef85a163fde917906e6e3da9388e5
Author: Richard Levitte <levitte at openssl.org>
Date: Mon Dec 11 21:01:18 2017 +0100
VMS build file template: adapt for when someone disabled 'makedepend'
Reviewed-by: Andy Polyakov <appro at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4907)
commit fe191b49b3eb1f14afa528b5f64a687488470daa
Author: Richard Levitte <levitte at openssl.org>
Date: Mon Dec 11 20:54:07 2017 +0100
Restore makedepend capabilities for Windows and VMS
This got lost somehow. The methods to do makedepend on Windows and
VMS are hard coded for cl (Windows) and CC/DECC (VMS), because that's
what we currently support natively.
Reviewed-by: Andy Polyakov <appro at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4907)
-----------------------------------------------------------------------
Summary of changes:
Configurations/descrip.mms.tmpl | 7 +++++--
Configure | 13 ++++++++++---
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 2bd9ad4..ff9d148 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -640,7 +640,7 @@ EOF
my $depbuild = $disabled{makedepend} ? ""
: " /MMS=(FILE=${objd}${objn}.tmp-D,TARGET=$obj.OBJ)";
- return <<"EOF";
+ return <<"EOF"
$obj.OBJ : $deps
${before}
SET DEFAULT $forward
@@ -649,11 +649,14 @@ $obj.OBJ : $deps
$incs_off
SET DEFAULT $backward
${after}
+ - PURGE $obj.OBJ
+EOF
+ . ($disabled{makedepend} ? "" : <<"EOF"
\@ PIPE ( \$(PERL) -e "use File::Compare qw/compare_text/; my \$x = compare_text(""$obj.D"",""$obj.tmp-D""); exit(0x10000000 + (\$x == 0));" || -
RENAME $obj.tmp-D $obj.d )
\@ IF F\$SEARCH("$obj.tmp-D") .NES. "" THEN DELETE $obj.tmp-D;*
- - PURGE $obj.OBJ
EOF
+ );
}
sub libobj2shlib {
my %args = @_;
diff --git a/Configure b/Configure
index 5abbd72..ba646f0 100755
--- a/Configure
+++ b/Configure
@@ -1279,12 +1279,19 @@ unless ($disabled{asm}) {
my %predefined = compiler_predefined($target{cc});
+# Check for makedepend capabilities.
if (!$disabled{makedepend}) {
- # We know that GNU C version 3 and up as well as all clang
- # versions support dependency generation
- if ($predefined{__GNUC__} >= 3) {
+ if ($config{target} =~ /^(VC|vms)-/) {
+ # For VC- and vms- targets, there's nothing more to do here. The
+ # functionality is hard coded in the corresponding build files for
+ # cl (Windows) and CC/DECC (VMS).
+ } elsif ($predefined{__GNUC__} >= 3) {
+ # We know that GNU C version 3 and up as well as all clang
+ # versions support dependency generation
$config{makedepprog} = "\$(CROSS_COMPILE)$target{cc}";
} else {
+ # In all other cases, we look for 'makedepend', and disable the
+ # capability if not found.
$config{makedepprog} = which('makedepend');
$disabled{makedepend} = "unavailable" unless $config{makedepprog};
}
More information about the openssl-commits
mailing list