From 55862e4bd7358e24b049f9aab4b28698910d08da Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 1 Aug 2017 21:57:13 +0000 Subject: [PATCH] projects.py ldflags: Also consider devel packages Signed-off-by: Jan Lindemann --- scripts/projects.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/projects.py b/scripts/projects.py index fda75181..c96d9ebc 100644 --- a/scripts/projects.py +++ b/scripts/projects.py @@ -285,7 +285,7 @@ def get_ldpathflags(names, exclude = []): continue libname = get_libname([m]) if len(libname): - r = r + ' -L' + proj_dir(m) + '/lib' + r = r + ' -L' + proj_dir(m) + '/lib' print(r[1:]) 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' + libname if len(r): - ldpathflags = get_ldpathflags(names, exclude) - if ldpathflags: - r = ldpathflags + ' ' + r + ldpathflags = get_ldpathflags(names, exclude) + if ldpathflags: + r = ldpathflags + ' ' + r return r[1::] return '' @@ -362,7 +362,7 @@ def cmd_ldlibpath(args_): parser = argparse.ArgumentParser(description='ldlibpath') parser.add_argument('module', nargs='*', help='Modules') 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) r = '' for m in deps: