rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

sb: Do not scan for libraries by default.

Browse Source
This commit is contained in:
Chris Johns 2014-02-11 14:06:07 +11:00
parent ee93200397
commit 55e52f403d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source-builder/sb/pkgconfig.py
View File

@ -160,9 +160,10 @@ class package(object):
for n in sorted(package.loaded): for n in sorted(package.loaded):
print package.loaded[n]._str() print package.loaded[n]._str()
def __init__(self, name = None, prefix = None, output = None, src = None): def __init__(self, name = None, prefix = None, libs_scan = False, output = None, src = None):
self._clean() self._clean()
self.name_ = name self.name_ = name
self.libs_scan = libs_scan
self.output = output self.output = output
self.src = src self.src = src
self.prefix = None self.prefix = None
@ -175,7 +176,7 @@ class package(object):
elif type(prefix) is list: elif type(prefix) is list:
self.prefix = prefix self.prefix = prefix
else: else:
raise error('invalid type of prefix') raise error('invalid type of prefix: %s' % (type(prefix)))
for p in self.prefix: for p in self.prefix:
for d in package.config_prefixes: for d in package.config_prefixes:
prefix = os.path.join(p, d, 'pkgconfig') prefix = os.path.join(p, d, 'pkgconfig')
@ -251,6 +252,7 @@ class package(object):
def _find_libraries(self, name): def _find_libraries(self, name):
libraries = [] libraries = []
if self.libs_scan:
for prefix in self.prefix: for prefix in self.prefix:
prefix = os.path.join(prefix, 'lib') prefix = os.path.join(prefix, 'lib')
if os.path.exists(prefix): if os.path.exists(prefix):
@ -374,8 +376,8 @@ class package(object):
self._clean() self._clean()
self.name_ = name self.name_ = name
file = self._find_package(name) file = self._find_package(name)
self._log('load: %s (%s)' % (name, file))
if file: if file:
self._log('load: %s (%s)' % (name, file))
if self.src: if self.src:
self.src.writelines('==%s%s' % ('=' * 80, os.linesep)) self.src.writelines('==%s%s' % ('=' * 80, os.linesep))
self.src.writelines(' %s %s%s' % (file, '=' * (80 - len(file)), os.linesep)) self.src.writelines(' %s %s%s' % (file, '=' * (80 - len(file)), os.linesep))
@ -418,6 +420,7 @@ class package(object):
self.fields[lhs] = rhs self.fields[lhs] = rhs
self.file_ = file self.file_ = file
else: else:
self._log('load: %s (libraries)' % (name))
self.libraries = self._find_libraries(name) self.libraries = self._find_libraries(name)
for nt in package.node_types: for nt in package.node_types:
requires = self.get(nt, private = False) requires = self.get(nt, private = False)
@ -436,6 +439,7 @@ class package(object):
self._log('failed: %s (%s %s %s)' % (r[0], ver, r[1], r[2])) self._log('failed: %s (%s %s %s)' % (r[0], ver, r[1], r[2]))
self.nodes['failed'][r[0]] = pkg self.nodes['failed'][r[0]] = pkg
if self.exists(): if self.exists():
self._log('load: exists')
package.loaded[name] = self package.loaded[name] = self
def get(self, label, private = True): def get(self, label, private = True):