janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

projects.py ldflags: Also consider devel packages

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-08-01 21:57:13 +00:00
commit 55862e4bd7
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scripts/projects.py
View file

@ -285,7 +285,7 @@ def get_ldpathflags(names, exclude = []):
continue continue
libname = get_libname([m]) libname = get_libname([m])
if len(libname): if len(libname):
r = r + ' -L' + proj_dir(m) + '/lib' r = r + ' -L' + proj_dir(m) + '/lib'
print(r[1:]) print(r[1:])
def get_ldflags(names, exclude = [], add_self_ = False): def get_ldflags(names, exclude = [], add_self_ = False):
@ -303,9 +303,9 @@ def get_ldflags(names, exclude = [], add_self_ = False):
#r = r + ' -L' + proj_dir(m) + '/lib -l' + libname #r = r + ' -L' + proj_dir(m) + '/lib -l' + libname
r = r + ' -l' + libname r = r + ' -l' + libname
if len(r): if len(r):
ldpathflags = get_ldpathflags(names, exclude) ldpathflags = get_ldpathflags(names, exclude)
if ldpathflags: if ldpathflags:
r = ldpathflags + ' ' + r r = ldpathflags + ' ' + r
return r[1::] return r[1::]
return '' return ''
@ -362,7 +362,7 @@ def cmd_ldlibpath(args_):
parser = argparse.ArgumentParser(description='ldlibpath') parser = argparse.ArgumentParser(description='ldlibpath')
parser.add_argument('module', nargs='*', help='Modules') parser.add_argument('module', nargs='*', help='Modules')
args=parser.parse_args(args_) args=parser.parse_args(args_)
deps = get_modules_from_project_txt(args.module, 'pkg.requires.jw', [ 'run', 'build' ], deps = get_modules_from_project_txt(args.module, 'pkg.requires.jw', [ 'run', 'build', 'devel' ],
scope = 2, add_self=True, names_only=True) scope = 2, add_self=True, names_only=True)
r = '' r = ''
for m in deps: for m in deps: