summaryrefslogtreecommitdiff
path: root/net/samba411/files/patch-ctdb_wscript
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2021-04-24 17:12:52 +0200
committerRene Ladan <rene@FreeBSD.org>2021-04-24 17:12:52 +0200
commitb661ebb122bf752933671f07435806ee5787acae (patch)
tree07baf5ff36db6ac8891569667866e09845dce113 /net/samba411/files/patch-ctdb_wscript
parentMk: unregister expired Samba 4.11 (diff)
Remove expired ports:
2021-04-22 net/samba411: Security Support ends on 03 Dec 2020 2021-04-22 net-im/cordless: Unmaintained and dead upstream, uses the old Discord API which notably has got users banned 2021-04-18 news/plor: listed as "Alpha-release" but last update in 2001; unmaintained 2021-04-20 security/certificate-transparency: Broken for more than 6 months
Diffstat (limited to 'net/samba411/files/patch-ctdb_wscript')
-rw-r--r--net/samba411/files/patch-ctdb_wscript61
1 files changed, 0 insertions, 61 deletions
diff --git a/net/samba411/files/patch-ctdb_wscript b/net/samba411/files/patch-ctdb_wscript
deleted file mode 100644
index 8c2205f80fdf..000000000000
--- a/net/samba411/files/patch-ctdb_wscript
+++ /dev/null
@@ -1,61 +0,0 @@
---- ctdb/wscript.orig 2019-05-22 10:16:26 UTC
-+++ ctdb/wscript
-@@ -104,6 +104,9 @@ def options(opt):
- opt.add_option('--enable-ceph-reclock',
- help=("Enable Ceph CTDB recovery lock helper (default=no)"),
- action="store_true", dest='ctdb_ceph_reclock', default=False)
-+ opt.add_option('--disable-ctdb-tests',
-+ help=("Disable CTDB tests (default=no)"),
-+ action="store_true", dest='ctdb_no_tests', default=False)
-
- opt.add_option('--with-logdir',
- help=("Path to log directory"),
-@@ -263,7 +266,7 @@ def configure(conf):
- conf.env['LIBPATH_CEPH-COMMON'] = conf.env['LIBPATH_RADOS'] + '/ceph'
-
- if (conf.CHECK_HEADERS('rados/librados.h', False, False, 'rados') and
-- conf.CHECK_LIB('rados', shlib=True)):
-+ conf.CHECK_LIB('rados', shlib=True)):
- conf.CHECK_LIB('ceph-common', shlib=True)
- Logs.info('Building with Ceph librados recovery lock support')
- conf.define('HAVE_LIBRADOS', 1)
-@@ -303,8 +306,14 @@ def configure(conf):
- conf.env.CTDB_VARDIR,
- conf.env.CTDB_RUNDIR))
-
-- conf.env.CTDB_TEST_DATADIR = os.path.join(conf.env.CTDB_DATADIR, 'tests')
-- conf.env.CTDB_TEST_LIBEXECDIR = os.path.join(conf.env.LIBEXECDIR, 'ctdb/tests')
-+ if Options.options.ctdb_no_tests:
-+ conf.env.ctdb_tests = False
-+ else:
-+ conf.env.ctdb_tests = True
-+
-+ if conf.env.ctdb_tests:
-+ conf.env.CTDB_TEST_DATADIR = os.path.join(conf.env.CTDB_DATADIR, 'tests')
-+ conf.env.CTDB_TEST_LIBEXECDIR = os.path.join(conf.env.LIBEXECDIR, 'ctdb/tests')
-
- # Allow unified compilation and separate compilation of utilities
- # to find includes
-@@ -685,9 +694,9 @@ def build(bld):
- rados_inc = bld.CONFIG_GET('CPPPATH_RADOS') + rados_inc
- bld.SAMBA_BINARY('ctdb_mutex_ceph_rados_helper',
- source='utils/ceph/ctdb_mutex_ceph_rados_helper.c',
-- deps='talloc tevent rados ceph-common',
-- includes=rados_inc,
-- install_path='${CTDB_HELPER_BINDIR}')
-+ deps='talloc tevent rados ceph-common',
-+ includes=rados_inc,
-+ install_path='${CTDB_HELPER_BINDIR}')
-
- sed_expr1 = 's|/usr/local/var/lib/ctdb|%s|g' % (bld.env.CTDB_VARDIR)
- sed_expr2 = 's|/usr/local/etc/ctdb|%s|g' % (bld.env.CTDB_ETCDIR)
-@@ -864,6 +873,9 @@ def build(bld):
- for d in ['volatile', 'persistent', 'state']:
- bld.INSTALL_DIR(os.path.join(bld.env.CTDB_VARDIR, d))
-
-+ if not bld.env.ctdb_tests:
-+ return
-+
- bld.SAMBA_BINARY('errcode',
- source='tests/src/errcode.c',
- deps='replace',