diff options
| author |   Ian Stakenvicius <axs@gentoo.org> | 2017-02-14 10:00:56 -0500 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2017-02-14 15:42:02 -0500 |
| commit | 94612023ec479de3b509eb6c67309481f3638582 (patch) | |
| tree | fe43aa7d5a2de2056ef6ec4c5224b3ec9e74afed /sys-libs/ldb/files | |
| parent | net-fs/samba-4.6.0_rc3: bump, python useflag, disable tests, etc (diff) | |
| download | gentoo-94612023ec479de3b509eb6c67309481f3638582.tar.gz gentoo-94612023ec479de3b509eb6c67309481f3638582.tar.bz2 gentoo-94612023ec479de3b509eb6c67309481f3638582.zip | |
sys-libs/ldb: make python optional, bug 603602
Package-Manager: portage-2.3.3
Diffstat (limited to 'sys-libs/ldb/files')
| -rw-r--r-- | sys-libs/ldb/files/ldb-1.1.29-disable-python.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/sys-libs/ldb/files/ldb-1.1.29-disable-python.patch b/sys-libs/ldb/files/ldb-1.1.29-disable-python.patch new file mode 100644 index 000000000000..bc4120e8acf6 --- /dev/null +++ b/sys-libs/ldb/files/ldb-1.1.29-disable-python.patch @@ -0,0 +1,48 @@ +--- a/lib/tdb/wscript 2016-11-30 09:56:00.000000000 -0500 ++++ b/lib/tdb/wscript 2017-02-08 16:37:49.160987205 -0500 +@@ -77,16 +77,16 @@ + conf.env.standalone_tdb = conf.IN_LAUNCH_DIR() + conf.env.building_tdb = True + ++ conf.env.disable_python = getattr(Options.options, 'disable_python', False) ++ + if not conf.env.standalone_tdb: + if conf.CHECK_BUNDLED_SYSTEM_PKG('tdb', minversion=VERSION, + implied_deps='replace'): + conf.define('USING_SYSTEM_TDB', 1) + conf.env.building_tdb = False +- if conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytdb', 'tdb', minversion=VERSION): ++ if not conf.env.disable_python and conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytdb', 'tdb', minversion=VERSION): + conf.define('USING_SYSTEM_PYTDB', 1) + +- conf.env.disable_python = getattr(Options.options, 'disable_python', False) +- + if (conf.CONFIG_SET('HAVE_ROBUST_MUTEXES') and + conf.env.building_tdb and + not conf.env.disable_tdb_mutex_locking): +--- a/lib/tevent/wscript 2016-10-07 00:45:35.000000000 -0400 ++++ b/lib/tevent/wscript 2017-02-08 16:39:22.478733175 -0500 +@@ -34,11 +34,13 @@ + + conf.env.standalone_tevent = conf.IN_LAUNCH_DIR() + ++ conf.env.disable_python = getattr(Options.options, 'disable_python', False) ++ + if not conf.env.standalone_tevent: + if conf.CHECK_BUNDLED_SYSTEM_PKG('tevent', minversion=VERSION, + onlyif='talloc', implied_deps='replace talloc'): + conf.define('USING_SYSTEM_TEVENT', 1) +- if conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION): ++ if not conf.env.disable_python and conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION): + conf.define('USING_SYSTEM_PYTEVENT', 1) + + if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'): +@@ -61,8 +63,6 @@ + if not conf.CONFIG_SET('USING_SYSTEM_TEVENT'): + conf.DEFINE('TEVENT_NUM_SIGNALS', tevent_num_signals) + +- conf.env.disable_python = getattr(Options.options, 'disable_python', False) +- + if not conf.env.disable_python: + # also disable if we don't have the python libs installed + conf.find_program('python', var='PYTHON') |