[vlc-commits] tools: bootstrap: Fix nasm version check
Hugo Beauzée-Luyssen
git at videolan.org
Thu Dec 20 00:26:22 CET 2018
vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Mar 26 13:19:38 2018 +0200| [7354a2c945489ea82162417250f09726bd6be285] | committer: David Fuhrmann
tools: bootstrap: Fix nasm version check
(cherry picked from commit 6839a212a1032c33dbfdaafe1b69bc795aa374f4)
Signed-off-by: David Fuhrmann <dfuhrmann at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=7354a2c945489ea82162417250f09726bd6be285
---
extras/tools/bootstrap | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index 3dd21ba6de..c4bd50d08f 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -63,6 +63,19 @@ then
fi
}
+check_nasm() {
+if ! nasm -v >/dev/null 2>&1
+then
+ echo "nasm not found"
+ NEEDED="$NEEDED .nasm"
+else
+ # found, need to check version ?
+ [ -z "$1" ] && return # no
+ gotver=`nasm -v | cut -d ' ' -f 3`
+ check_version nasm $gotver $1
+fi
+}
+
check() {
if ! $1 --version >/dev/null 2>&1 && ! $1 -version >/dev/null 2>&1
then
@@ -91,7 +104,7 @@ check ant
check xz
check bison 3.0.0
check flex
-check nasm 2.13.01
+check_nasm 2.13.01
check meson 0.48.1
check ninja
More information about the vlc-commits
mailing list