diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2012-06-18 22:30:04 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-06-19 05:38:05 +0200 |
| commit | 6244f668a34279e6da62213333dfb32c3ccdb17d (patch) | |
| tree | 0dd495f4d03e57e8a5710d2edea84c137d4b4aee /script | |
| parent | 5bad913938daca4ae3020653690701db83826954 (diff) | |
| download | samba-6244f668a34279e6da62213333dfb32c3ccdb17d.tar.gz samba-6244f668a34279e6da62213333dfb32c3ccdb17d.tar.bz2 samba-6244f668a34279e6da62213333dfb32c3ccdb17d.zip | |
TDB2: make SAMBA use tdb1 again for the moment.
Otherwise the following surgery will break the SAMBA build and testsuite.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'script')
| -rwxr-xr-x | script/autobuild.py | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/script/autobuild.py b/script/autobuild.py index e98408dd23..9fb0a7ced5 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -21,7 +21,6 @@ builddirs = { "samba4-libs" : ".", "ldb" : "lib/ldb", "tdb" : "lib/tdb", - "tdb2" : "lib/tdb2", "talloc" : "lib/talloc", "replace" : "lib/replace", "tevent" : "lib/tevent", @@ -31,7 +30,7 @@ builddirs = { "retry" : "." } -defaulttasks = [ "samba3", "samba4", "samba4-libs", "ldb", "tdb", "tdb2", "talloc", "replace", "tevent", "pidl" ] +defaulttasks = [ "samba3", "samba4", "samba4-libs", "ldb", "tdb", "talloc", "replace", "tevent", "pidl" ] tasks = { "samba3" : [ ("autogen", "./autogen.sh", "text/plain"), @@ -67,11 +66,11 @@ tasks = { ("tevent-make", "cd lib/tevent && make -j", "text/plain"), ("tevent-install", "cd lib/tevent && make install", "text/plain"), - ("ldb-configure", "cd lib/ldb && PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=NONE --disable-tdb2 --abi-check --enable-debug -C ${PREFIX}", "text/plain"), + ("ldb-configure", "cd lib/ldb && PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=NONE --abi-check --enable-debug -C ${PREFIX}", "text/plain"), ("ldb-make", "cd lib/ldb && make -j", "text/plain"), ("ldb-install", "cd lib/ldb && make install", "text/plain"), - ("configure", "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=!talloc,!tdb,!pytdb,!ldb,!pyldb,!tevent,!pytevent --disable-tdb2 --abi-check --enable-debug -C ${PREFIX}", "text/plain"), + ("configure", "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=!talloc,!tdb,!pytdb,!ldb,!pyldb,!tevent,!pytevent --abi-check --enable-debug -C ${PREFIX}", "text/plain"), ("make", "make -j", "text/plain"), ("install", "make install", "text/plain")], @@ -92,14 +91,6 @@ tasks = { ("distcheck", "make distcheck", "text/plain"), ("clean", "make clean", "text/plain") ], - "tdb2" : [ ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"), - ("make", "make -j", "text/plain"), - ("install", "make install", "text/plain"), - ("test", "make test", "text/plain"), - ("check-clean-tree", "../../script/clean-source-tree.sh", "text/plain"), - ("distcheck", "make distcheck", "text/plain"), - ("clean", "make clean", "text/plain") ], - "talloc" : [ ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"), ("make", "make -j", "text/plain"), ("install", "make install", "text/plain"), |