X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/658bba67c018a0b51df08723cd4c3a57c2668d2e..af8dfb4559236e6ebf7489b37a83d7cc440404ac:/scripts/buildorder.py

diff --git a/scripts/buildorder.py b/scripts/buildorder.py
index fa02f7a9..7bebd414 100755
--- a/scripts/buildorder.py
+++ b/scripts/buildorder.py
@@ -2,6 +2,7 @@
 # buildorder.py - script to generate a build order respecting package dependencies
 
 import os
+import re
 import sys
 
 from itertools import filterfalse
@@ -52,7 +53,8 @@ class TermuxBuildFile(object):
                 comma_deps = line[len(prefix):].replace('"', '')
 
                 return set([
-                    dep.strip() for dep in comma_deps.split(',')
+                    # Replace parenthesis to handle version qualifiers, as in "gcc (>= 5.0)":
+                    re.sub(r'\(.*?\)', '', dep).strip() for dep in comma_deps.split(',')
                     if 'libandroid-support' not in dep
                 ])
 
@@ -70,7 +72,7 @@ class TermuxPackage(object):
         # search package build.sh
         build_sh_path = os.path.join(self.dir, 'build.sh')
         if not os.path.isfile(build_sh_path):
-            raise Exception("build.sh not found")
+            raise Exception("build.sh not found for package '" + name + "'")
 
         self.buildfile = TermuxBuildFile(build_sh_path)
         self.deps = self.buildfile._get_dependencies()