chiark
/
gitweb
/
~mdw
/
termux-packages
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4873188
)
buildorder.py: Handle version qualifiers
author
Fredrik Fornwall
<fredrik@fornwall.net>
Fri, 29 Apr 2016 12:14:28 +0000
(14:14 +0200)
committer
Fredrik Fornwall
<fredrik@fornwall.net>
Fri, 29 Apr 2016 12:14:28 +0000
(14:14 +0200)
scripts/buildorder.py
patch
|
blob
|
blame
|
history
diff --git
a/scripts/buildorder.py
b/scripts/buildorder.py
index fa02f7a9e5ef99d7e0965840e5d04e5ae2bc952e..b6581534978f915ed064f534278c58251b2e03f2 100755
(executable)
--- 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
# buildorder.py - script to generate a build order respecting package dependencies
import os
+import re
import sys
from itertools import filterfalse
import sys
from itertools import filterfalse
@@
-52,7
+53,8
@@
class TermuxBuildFile(object):
comma_deps = line[len(prefix):].replace('"', '')
return set([
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
])
if 'libandroid-support' not in dep
])