mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 12:03:31 +01:00
build.py: Determine prerequisites from PREREQ@defs.mk instead of PREREQ_BUILD
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
dcdf0c9e84
commit
94beb5eb96
1 changed files with 3 additions and 1 deletions
|
|
@ -32,7 +32,9 @@ def find_proj_path(name):
|
|||
def read_deps(cur, prereq_type):
|
||||
path = find_proj_path(cur)
|
||||
os.chdir(path)
|
||||
p = subprocess.Popen("LD_LIBRARY_PATH= make echo-prereq | sed '/PREREQ_" + prereq_type + " *=/ !d; s/.*=//'", shell=True, stdout=subprocess.PIPE)
|
||||
# ignoring prereq_type, as it has never been anything but BUILD, now
|
||||
# only looking for PREREQ without anything
|
||||
p = subprocess.Popen("LD_LIBRARY_PATH= make echo-prereq | sed '/PREREQ " + " *=/ !d; s/.*=//'", shell=True, stdout=subprocess.PIPE)
|
||||
p.wait()
|
||||
if p.returncode: # FIXME: doesn't work, because sed kills make's return code
|
||||
raise Exception("failed to get " + prereq_type + " prerequisites from " + path)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue