The branch master has been updated
via 18174ba8a3c634085c5cd15e0f28339e7b6cf679 (commit)
from cba024dc685d13dbcbd0577bed028ee6b295b56a (commit)
- Log -----------------------------------------------------------------
commit 18174ba8a3c634085c5cd15e0f28339e7b6cf679
Author: Richard Levitte <levi...@openssl.org>
Date: Sun Aug 12 10:14:06 2018 +0200
Configurations/15-android.conf: Make sure that the NDK path is canonical
Extra slashes in paths are permissible in Unix-like platforms...
however, when compared with the result from 'which', which returns
canonical paths, the comparison might fail even though the compared
paths may be equivalent. We make the NDK path canonical internally to
ensure the equivalence compares as equal, at least for the most
trivial cases.
Fixes #6917
Reviewed-by: Tim Hudson <t...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6924)
-----------------------------------------------------------------------
Summary of changes:
Configurations/15-android.conf | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Configurations/15-android.conf b/Configurations/15-android.conf
index ddd642a..89c5d0a 100644
--- a/Configurations/15-android.conf
+++ b/Configurations/15-android.conf
@@ -4,6 +4,8 @@
# comments below...
{
+ use File::Spec::Functions;
+
my $android_ndk = {};
my %triplet = (
arm => "arm-linux-androideabi",
@@ -22,6 +24,7 @@
my $ndk = $ENV{ANDROID_NDK};
die "\$ANDROID_NDK is not defined" if (!$ndk);
+ $ndk = canonpath($ndk);
die "\$ANDROID_NDK=$ndk is invalid" if (!-d "$ndk/platforms");
my $ndkver = undef;
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
