def PRIVATE_NAME(bld, name, private_extension, private_library):
'''possibly rename a library to include a bundled extension'''
+ if not private_library:
+ return name
+
# we now use the same private name for libraries as the public name.
# see http://git.samba.org/?p=tridge/junkcode.git;a=tree;f=shlib for a
# demonstration that this is the right thing to do
# also see http://lists.samba.org/archive/samba-technical/2011-January/075816.html
- return name
+ if private_extension:
+ return name
+
+ extension = bld.env.PRIVATE_EXTENSION
+
+ if extension and name.startswith('%s' % extension):
+ return name
+
+ if extension and name.endswith('%s' % extension):
+ return name
+
+ return "%s-%s" % (name, extension)
def target_in_list(target, lst, default):
def BUILTIN_LIBRARY(bld, name):
'''return True if a library should be builtin
instead of being built as a shared lib'''
- if bld.env.DISABLE_SHARED:
- return True
return target_in_list(name, bld.env.BUILTIN_LIBRARIES, False)
Build.BuildContext.BUILTIN_LIBRARY = BUILTIN_LIBRARY
@conf
def LIB_MAY_BE_BUNDLED(conf, libname):
- return ('NONE' not in conf.env.BUNDLED_LIBS and
- '!%s' % libname not in conf.env.BUNDLED_LIBS)
-
+ if libname in conf.env.BUNDLED_LIBS:
+ return True
+ if '!%s' % libname in conf.env.BUNDLED_LIBS:
+ return False
+ if 'NONE' in conf.env.BUNDLED_LIBS:
+ return False
+ return True
@conf
def LIB_MUST_BE_BUNDLED(conf, libname):
- return ('ALL' in conf.env.BUNDLED_LIBS or
- libname in conf.env.BUNDLED_LIBS)
+ if libname in conf.env.BUNDLED_LIBS:
+ return True
+ if '!%s' % libname in conf.env.BUNDLED_LIBS:
+ return False
+ if 'ALL' in conf.env.BUNDLED_LIBS:
+ return True
+ return False
+@conf
+def LIB_MUST_BE_PRIVATE(conf, libname):
+ return ('ALL' in conf.env.PRIVATE_LIBS or
+ libname in conf.env.PRIVATE_LIBS)
@conf
def CHECK_PREREQUISITES(conf, prereqs):
+ missing = []
for syslib in TO_LIST(prereqs):
f = 'FOUND_SYSTEMLIB_%s' % syslib
if not f in conf.env:
- return False
- return True
+ missing.append(syslib)
+ return missing
@runonce
This only tries using pkg-config
'''
- if conf.LIB_MUST_BE_BUNDLED(libname):
- return False
- found = 'FOUND_SYSTEMLIB_%s' % libname
- if found in conf.env:
- return conf.env[found]
-
- # see if the library should only use a system version if another dependent
- # system version is found. That prevents possible use of mixed library
- # versions
- if onlyif:
- if not conf.CHECK_PREREQUISITES(onlyif):
- if not conf.LIB_MAY_BE_BUNDLED(libname):
- Logs.error('ERROR: Use of system library %s depends on missing system library %s' % (libname, syslib))
- sys.exit(1)
- conf.env[found] = False
- return False
-
- minversion = minimum_library_version(conf, libname, minversion)
-
- msg = 'Checking for system %s' % libname
- if minversion != '0.0.0':
- msg += ' >= %s' % minversion
-
- if pkg is None:
- pkg = libname
-
- if conf.check_cfg(package=pkg,
- args='"%s >= %s" --cflags --libs' % (pkg, minversion),
- msg=msg, uselib_store=libname.upper()):
- conf.SET_TARGET_TYPE(libname, 'SYSLIB')
- conf.env[found] = True
- if implied_deps:
- conf.SET_SYSLIB_DEPS(libname, implied_deps)
- return True
- conf.env[found] = False
- if not conf.LIB_MAY_BE_BUNDLED(libname):
- Logs.error('ERROR: System library %s of version %s not found, and bundling disabled' % (libname, minversion))
- sys.exit(1)
- return False
-
+ return conf.CHECK_BUNDLED_SYSTEM(libname,
+ minversion=minversion,
+ onlyif=onlyif,
+ implied_deps=implied_deps,
+ pkg=pkg)
@runonce
@conf
def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0',
- checkfunctions=None, headers=None,
+ checkfunctions=None, headers=None, checkcode=None,
onlyif=None, implied_deps=None,
- require_headers=True):
+ require_headers=True, pkg=None, set_target=True):
'''check if a library is available as a system library.
this first tries via pkg-config, then if that fails
tries by testing for a specified function in the specified lib
if found in conf.env:
return conf.env[found]
- def check_functions_headers():
+ def check_functions_headers_code():
'''helper function for CHECK_BUNDLED_SYSTEM'''
- if checkfunctions is None:
- return True
if require_headers and headers and not conf.CHECK_HEADERS(headers, lib=libname):
return False
- return conf.CHECK_FUNCS_IN(checkfunctions, libname, headers=headers,
- empty_decl=False, set_target=False)
+ if checkfunctions is not None:
+ ok = conf.CHECK_FUNCS_IN(checkfunctions, libname, headers=headers,
+ empty_decl=False, set_target=False)
+ if not ok:
+ return False
+ if checkcode is not None:
+ define='CHECK_BUNDLED_SYSTEM_%s' % libname.upper()
+ ok = conf.CHECK_CODE(checkcode, lib=libname,
+ headers=headers, local_include=False,
+ msg=msg, define=define)
+ conf.CONFIG_RESET(define)
+ if not ok:
+ return False
+ return True
+
# see if the library should only use a system version if another dependent
# system version is found. That prevents possible use of mixed library
# versions
if onlyif:
- if not conf.CHECK_PREREQUISITES(onlyif):
+ missing = conf.CHECK_PREREQUISITES(onlyif)
+ if missing:
if not conf.LIB_MAY_BE_BUNDLED(libname):
- Logs.error('ERROR: Use of system library %s depends on missing system library %s' % (libname, syslib))
+ Logs.error('ERROR: Use of system library %s depends on missing system library/libraries %r' % (libname, missing))
sys.exit(1)
conf.env[found] = False
return False
if minversion != '0.0.0':
msg += ' >= %s' % minversion
+ uselib_store=libname.upper()
+ if pkg is None:
+ pkg = libname
+
# try pkgconfig first
- if (conf.check_cfg(package=libname,
- args='"%s >= %s" --cflags --libs' % (libname, minversion),
- msg=msg) and
- check_functions_headers()):
- conf.SET_TARGET_TYPE(libname, 'SYSLIB')
+ if (conf.check_cfg(package=pkg,
+ args='"%s >= %s" --cflags --libs' % (pkg, minversion),
+ msg=msg, uselib_store=uselib_store) and
+ check_functions_headers_code()):
+ if set_target:
+ conf.SET_TARGET_TYPE(libname, 'SYSLIB')
conf.env[found] = True
if implied_deps:
conf.SET_SYSLIB_DEPS(libname, implied_deps)
return True
if checkfunctions is not None:
- if check_functions_headers():
+ if check_functions_headers_code():
conf.env[found] = True
if implied_deps:
conf.SET_SYSLIB_DEPS(libname, implied_deps)
- conf.SET_TARGET_TYPE(libname, 'SYSLIB')
+ if set_target:
+ conf.SET_TARGET_TYPE(libname, 'SYSLIB')
return True
conf.env[found] = False
if not conf.LIB_MAY_BE_BUNDLED(libname):
return False
+def tuplize_version(version):
+ return tuple([int(x) for x in version.split(".")])
+
@runonce
@conf
def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, minversion='0.0.0'):
except AttributeError:
found = False
else:
- found = tuple(version.split(".")) >= tuple(minversion.split("."))
+ found = tuplize_version(version) >= tuplize_version(minversion)
if not found and not conf.LIB_MAY_BE_BUNDLED(libname):
Logs.error('ERROR: Python module %s of version %s not found, and bundling disabled' % (libname, minversion))
sys.exit(1)
def NONSHARED_BINARY(bld, name):
'''return True if a binary should be built without non-system shared libs'''
- if bld.env.DISABLE_SHARED:
- return True
return target_in_list(name, bld.env.NONSHARED_BINARIES, False)
Build.BuildContext.NONSHARED_BINARY = NONSHARED_BINARY
git.samba.org / obnox / samba / samba-obnox.git / blobdiff