The branch master has been updated
via 2e31ef0366d368ac8cf7f5ecc9052bff27337799 (commit)
from a7a14a23a92a6accec3a39e979d377e1ddda2f75 (commit)
- Log -----------------------------------------------------------------
commit 2e31ef0366d368ac8cf7f5ecc9052bff27337799
Author: Rich Salz <[email protected]>
Date: Thu Dec 10 12:31:01 2015 -0500
Provide better "make depend" warning.
Reviewed-by: Matt Caswell <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Configure | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/Configure b/Configure
index 592bd77..b23cd2b 100755
--- a/Configure
+++ b/Configure
@@ -108,6 +108,9 @@ my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC
-Wno-long-long -Wsign-compare
# -Wextended-offsetof
my $clang_devteam_warn = "-Wno-unused-parameter
-Wno-missing-field-initializers -Wno-language-extension-token
-Wno-extended-offsetof -Wconditional-uninitialized -Qunused-arguments
-Wincompatible-pointer-types-discards-qualifiers
-Wmissing-variable-declarations";
+# Warn that "make depend" should be run?
+my $warn_make_depend = 0;
+
# These are used in addition to $gcc_devteam_warn unless this is a mingw build.
# This adds backtrace information to the memory leak info.
my $memleak_devteam_backtrace = "-rdynamic -DCRYPTO_MDEBUG_BACKTRACE";
@@ -2152,13 +2155,8 @@ EOF
(system $make_command.$make_targets) == 0 or die "make $make_targets
failed"
if $make_targets ne "";
if ($depflags ne $default_depflags && !$make_depend) {
- print <<EOF;
-
-Since you've disabled or enabled at least one algorithm, you need to do
-the following before building:
-
- make depend
-EOF
+ $warn_make_depend++;
+ }
}
}
@@ -2238,12 +2236,18 @@ EOF
print <<\EOF if ($no_shared_warn);
-You gave the option 'shared'. Normally, that would give you shared libraries.
-Unfortunately, the OpenSSL configuration doesn't include shared library support
-for this platform yet, so it will pretend you gave the option 'no-shared'. If
-you can inform the developpers (openssl-dev\@openssl.org) how to support shared
-libraries on this platform, they will at least look at it and try their best
-(but please first make sure you have tried with a current version of OpenSSL).
+You gave the option 'shared', which is not supported on this platform, so
+we will pretend you gave the option 'no-shared'. If you know how to implement
+shared libraries, please let us know (but please first make sure you have
+tried with a current version of OpenSSL).
+EOF
+
+print <<EOF if ($warn_make_depend);
+
+*** Because of configuration changes, you MUST do the following before
+*** building:
+
+ make depend
EOF
exit(0);
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
