summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2019-08-23 20:40:24 +0200
committerLars Wendler <polynomial-c@gentoo.org>2019-08-23 21:11:21 +0200
commit3ce51c9f5c16bc324efcf3907c15a44afbf692df (patch)
tree6fdd4895618d13309298e777bf0a5a7e0093393c /sys-libs/ldb/files
parentsys-libs/ldb: Bump to version 2.0.5 (diff)
downloadgentoo-3ce51c9f5c16bc324efcf3907c15a44afbf692df.tar.gz
gentoo-3ce51c9f5c16bc324efcf3907c15a44afbf692df.tar.bz2
gentoo-3ce51c9f5c16bc324efcf3907c15a44afbf692df.zip
sys-libs/ldb: Removed old.
Package-Manager: Portage-2.3.72, Repoman-2.3.17 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'sys-libs/ldb/files')
-rw-r--r--sys-libs/ldb/files/ldb-1.1.24-optional-python.patch72
1 files changed, 0 insertions, 72 deletions
diff --git a/sys-libs/ldb/files/ldb-1.1.24-optional-python.patch b/sys-libs/ldb/files/ldb-1.1.24-optional-python.patch
deleted file mode 100644
index d8dda63d44b7..000000000000
--- a/sys-libs/ldb/files/ldb-1.1.24-optional-python.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/wscript 2015-12-10 06:01:40.000000000 -0500
-+++ b/wscript 2016-01-06 15:05:57.013617848 -0500
-@@ -5,6 +5,7 @@
-
- blddir = 'bin'
-
-+import Logs
- import sys, os
-
- # find the buildtools directory
-@@ -13,7 +14,7 @@
- srcdir = srcdir + '/..'
- sys.path.insert(0, srcdir + '/buildtools/wafsamba')
-
--import wafsamba, samba_dist, Utils
-+import wafsamba, samba_dist, Utils, Options
-
- samba_dist.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc
- lib/tdb:lib/tdb lib/tdb:lib/tdb lib/tevent:lib/tevent
-@@ -28,8 +29,17 @@
- opt.RECURSE('lib/tevent')
- opt.RECURSE('lib/replace')
- opt.tool_options('python') # options for disabling pyc or pyo compilation
-+ if opt.IN_LAUNCH_DIR():
-+ opt.add_option('--disable-python',
-+ help=("disable the pyldb modules"),
-+ action="store_true", dest='disable_python', default=False)
-+
-
- def configure(conf):
-+ conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
-+
-+ conf.env.disable_python = getattr(Options.options, 'disable_python', False)
-+
- conf.RECURSE('lib/tdb')
- conf.RECURSE('lib/tevent')
-
-@@ -44,16 +54,18 @@
- conf.RECURSE('lib/replace')
- conf.find_program('python', var='PYTHON')
- conf.find_program('xsltproc', var='XSLTPROC')
-- conf.check_tool('python')
-- conf.check_python_version((2,4,2))
-- conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True)
-+
-+ if not conf.env.disable_python:
-+ conf.SAMBA_CHECK_PYTHON(mandatory=False, version=(2,4,2))
-+ conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False)
-+ if not conf.env.HAVE_PYTHON_H:
-+ Logs.warn('Disabling pyldb-util as python devel libs not found')
-+ conf.env.disable_python = True
-
- # where does the default LIBDIR end up? in conf.env somewhere?
- #
- conf.CONFIG_PATH('LDB_MODULESDIR', conf.SUBST_ENV_VAR('MODULESDIR') + '/ldb')
-
-- conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
--
- if not conf.env.standalone_ldb:
- if conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util', minversion=VERSION,
- onlyif='talloc tdb tevent',
---- a/lib/talloc/wscript 2015-11-06 08:28:25.000000000 -0500
-+++ b/lib/talloc/wscript 2016-01-06 15:07:43.673478788 -0500
-@@ -48,7 +48,7 @@
- if conf.CHECK_BUNDLED_SYSTEM_PKG('talloc', minversion=VERSION,
- implied_deps='replace'):
- conf.define('USING_SYSTEM_TALLOC', 1)
-- if conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
-+ if not conf.env.disable_python and conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
- implied_deps='talloc replace'):
- conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1)
-