[vlc-devel] [PATCH 2/2] Revert "Fix the tools bootstrap version check"

Hugo Beauzée-Luyssen hugo at beauzee.fr
Mon Aug 21 13:04:28 CEST 2017


This reverts commit ee5fad6a354d4fde1bb98f715e0455c603599554.
This is causing protoc 3.1 to be considered too old when requiring 2.6
---
 extras/tools/bootstrap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index c1217fab43..fcd64c0869 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -60,7 +60,7 @@ else
     needminor=`echo $2|cut -d. -f2`
     needmicro=`echo $2|cut -d. -f3`
     [ -z "$needmicro" ] && needmicro=0
-    if [ "$needmajor" -ne "$gotmajor" \
+    if [ "$needmajor" -gt "$gotmajor" \
          -o "$needmajor" -eq "$gotmajor" -a "$needminor" -gt "$gotminor" \
          -o "$needmajor" -eq "$gotmajor" -a "$needminor" -eq "$gotminor" -a "$needmicro" -gt "$gotmicro" ]
     then
-- 
2.11.0



More information about the vlc-devel mailing list