diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-04-12 09:49:56 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-12 09:50:49 +1000 |
| commit | f8e527b088ab19aab5a36a70a45a1032ad338d45 (patch) | |
| tree | 42429aa6325d70eb305dd012231f238d8fcf4ebe | |
| parent | 2179c6a8f843d9db5860b6c91d154d288f28d741 (diff) | |
| download | samba-f8e527b088ab19aab5a36a70a45a1032ad338d45.tar.gz samba-f8e527b088ab19aab5a36a70a45a1032ad338d45.tar.bz2 samba-f8e527b088ab19aab5a36a70a45a1032ad338d45.zip | |
build: added --minimum-library-version configure option
this allows the packager to override the default choice of system
library version
| -rw-r--r-- | buildtools/wafsamba/samba_bundled.py | 19 | ||||
| -rw-r--r-- | buildtools/wafsamba/wscript | 4 |
2 files changed, 23 insertions, 0 deletions
diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py index bab4143a9a..f87ff8027c 100644 --- a/buildtools/wafsamba/samba_bundled.py +++ b/buildtools/wafsamba/samba_bundled.py @@ -54,6 +54,22 @@ def BUNDLED_EXTENSION_DEFAULT(opt, extension, noextenion=''): Options.Handler.BUNDLED_EXTENSION_DEFAULT = BUNDLED_EXTENSION_DEFAULT +def minimum_library_version(conf, libname, default): + '''allow override of mininum system library version''' + + minlist = Options.options.MINIMUM_LIBRARY_VERSION + if not minlist: + return default + + for m in minlist.split(','): + a = m.split(':') + if len(a) != 2: + Logs.error("Bad syntax for --minimum-library-version of %s" % m) + sys.exit(1) + if a[0] == libname: + return a[1] + return default + @runonce @conf @@ -84,6 +100,8 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0', conf.env[found] = False return False + minversion = minimum_library_version(conf, libname, minversion) + # try pkgconfig first if conf.check_cfg(package=libname, args='"%s >= %s" --cflags --libs' % (libname, minversion), @@ -107,3 +125,4 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0', Logs.error('ERROR: System library %s of version %s not found, and bundling disabled' % (libname, minversion)) sys.exit(1) return False + diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript index 1ae6b97640..2e42139bb9 100644 --- a/buildtools/wafsamba/wscript +++ b/buildtools/wafsamba/wscript @@ -30,6 +30,10 @@ def set_options(opt): help=("command separated list of libraries to build directly into binaries [%s]" % builtin_defauilt), action="store", dest='BUILTIN_LIBRARIES', default=builtin_defauilt) + opt.add_option('--minimum-library-version', + help=("list of minimum system library versions (LIBNAME1:version,LIBNAME2:version)"), + action="store", dest='MINIMUM_LIBRARY_VERSION', default='') + opt.add_option('--with-modulesdir', help=("modules directory [PREFIX/modules]"), action="store", dest='MODULESDIR', default='${PREFIX}/modules') |