diff options
| author | Michael Adam <obnox@samba.org> | 2014-10-24 17:42:51 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2014-11-07 20:58:12 +0100 |
| commit | 80a51bbe66b1c50d737f9db1ce5fef45b6365959 (patch) | |
| tree | 2b08bc69c9a12d26780277dc2a8fea03ab75e93a /script | |
| parent | 2522be0eb648cc752b6fd43a870bdc01ea3f49dd (diff) | |
| download | samba-80a51bbe66b1c50d737f9db1ce5fef45b6365959.tar.gz | |
autobuild: adapt samba-ctdb target does not need a separate ctdb build any more
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit eeebbe73125967943d95b6e03cbf695d3d219bc0)
Diffstat (limited to 'script')
| -rwxr-xr-x | script/autobuild.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/script/autobuild.py b/script/autobuild.py index c5d3cad97c3..d62538ea2b7 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -58,14 +58,9 @@ tasks = { ("tdb-make", "cd lib/tdb && make", "text/plain"), ("tdb-install", "cd lib/tdb && make install", "text/plain"), - # build and install ctdb: - ("ctdb-configure", "cd ./ctdb && PKG_CONFIG_PATH=${PREFIX_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH} ./configure ${PREFIX} --bundled-libraries=!tdb", "text/plain"), - ("ctdb-make", "cd ./ctdb && make all", "text/plain"), - ("ctdb-install", "cd ./ctdb && make install", "text/plain"), - ("ctdb-header-ls", "ls ${PREFIX_DIR}/include/ctdb.h", "text/plain"), # build samba with cluster support against this ctdb: - ("samba-configure", "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=${PREFIX_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH} ./configure.developer ${PREFIX} --with-selftest-prefix=./bin/ab --with-cluster-support --with-ctdb-dir=${PREFIX_DIR} --bundled-libraries=!tdb", "text/plain"), + ("samba-configure", "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=${PREFIX_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH} ./configure.developer ${PREFIX} --with-selftest-prefix=./bin/ab --with-cluster-support --bundled-libraries=!tdb", "text/plain"), ("samba-make", "make", "text/plain"), ("samba-check", "./bin/smbd -b | grep CLUSTER_SUPPORT", "text/plain"), ("samba-install", "make install", "text/plain"), |