chiark
/
gitweb
/
~mdw
/
termux-packages
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pass: Add comment on why we depend on coreutils
[termux-packages]
/
scripts
/
buildorder.py
diff --git
a/scripts/buildorder.py
b/scripts/buildorder.py
index 19cb01c8b1a27302280e50a4f45e9cf733887d85..1890a0d9374aad0d205fef6e35f0a0f7acb0abcc 100755
(executable)
--- a/
scripts/buildorder.py
+++ b/
scripts/buildorder.py
@@
-38,13
+38,16
@@
class TermuxBuildFile(object):
def _get_dependencies(self):
pkg_dep_prefix = 'TERMUX_PKG_DEPENDS='
def _get_dependencies(self):
pkg_dep_prefix = 'TERMUX_PKG_DEPENDS='
+ pkg_build_dep_prefix = 'TERMUX_PKG_BUILD_DEPENDS='
subpkg_dep_prefix = 'TERMUX_SUBPKG_DEPENDS='
subpkg_dep_prefix = 'TERMUX_SUBPKG_DEPENDS='
- with open(self.path) as f:
+ with open(self.path
, encoding="utf-8"
) as f:
prefix = None
for line in f:
if line.startswith(pkg_dep_prefix):
prefix = pkg_dep_prefix
prefix = None
for line in f:
if line.startswith(pkg_dep_prefix):
prefix = pkg_dep_prefix
+ elif line.startswith(pkg_build_dep_prefix):
+ prefix = pkg_build_dep_prefix
elif line.startswith(subpkg_dep_prefix):
prefix = subpkg_dep_prefix
else:
elif line.startswith(subpkg_dep_prefix):
prefix = subpkg_dep_prefix
else:
@@
-218,6
+221,8
@@
def generate_targets_buildorder(targetnames):
buildorder = []
for pkgname in targetnames:
buildorder = []
for pkgname in targetnames:
+ if not pkgname in pkgs_map:
+ die('Dependencies for ' + pkgname + ' could not be calculated (skip dependency check with -s)')
buildorder += deps_then_me(pkgs_map[pkgname])
return unique_everseen(buildorder)
buildorder += deps_then_me(pkgs_map[pkgname])
return unique_everseen(buildorder)