summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2018-05-10 09:09:56 +1200
committerStefan Metzmacher <metze@samba.org>2018-05-25 13:07:47 +0200
commite9b638c43f006bd48158f21fc9b598c61d615499 (patch)
tree921d077bec6db685e37c8723117b0626250fa71d
parent95c117ff1114122aad367adab6c738b835a7c3d3 (diff)
downloadsamba-e9b638c43f006bd48158f21fc9b598c61d615499.tar.gz
autobuild: cover the Gentoo case with python disabled all down the stack
Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Fri May 25 13:07:47 CEST 2018 on sn-devel-144
-rwxr-xr-xscript/autobuild.py32
1 files changed, 28 insertions, 4 deletions
diff --git a/script/autobuild.py b/script/autobuild.py
index 2d71b5ea305..429d6443792 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -80,9 +80,10 @@ samba_configure_params = " --picky-developer ${PREFIX} ${EXTRA_PYTHON} --with-pr
samba_libs_envvars = "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH"
samba_libs_envvars += " PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig"
samba_libs_envvars += " ADDITIONAL_CFLAGS='-Wmissing-prototypes'"
-samba_libs_configure_base = samba_libs_envvars + " ./configure --abi-check --enable-debug --picky-developer -C ${PREFIX} ${EXTRA_PYTHON}"
-samba_libs_configure_libs = samba_libs_configure_base + " --bundled-libraries=cmocka,NONE"
-samba_libs_configure_samba = samba_libs_configure_base + " --bundled-libraries=!talloc,!pytalloc-util,!tdb,!pytdb,!ldb,!pyldb,!pyldb-util,!tevent,!pytevent"
+samba_libs_configure_base = samba_libs_envvars + " ./configure --abi-check --enable-debug --picky-developer -C ${PREFIX}"
+samba_libs_configure_libs = samba_libs_configure_base + " --bundled-libraries=cmocka,NONE ${EXTRA_PYTHON}"
+samba_libs_configure_bundled_libs = " --bundled-libraries=!talloc,!pytalloc-util,!tdb,!pytdb,!ldb,!pyldb,!pyldb-util,!tevent,!pytevent"
+samba_libs_configure_samba = samba_libs_configure_base + samba_libs_configure_bundled_libs + " ${EXTRA_PYTHON}"
if os.environ.get("AUTOBUILD_NO_EXTRA_PYTHON", "0") == "1":
extra_python = ""
@@ -274,7 +275,30 @@ tasks = {
("make", "make -j", "text/plain"),
("install", "make install", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
- ("clean", "make clean", "text/plain")
+ ("clean", "make clean", "text/plain"),
+
+ ("talloc-configure", "cd lib/talloc && " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python", "text/plain"),
+ ("talloc-make", "cd lib/talloc && make", "text/plain"),
+ ("talloc-install", "cd lib/talloc && make install", "text/plain"),
+
+ ("tdb-configure", "cd lib/tdb && " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python", "text/plain"),
+ ("tdb-make", "cd lib/tdb && make", "text/plain"),
+ ("tdb-install", "cd lib/tdb && make install", "text/plain"),
+
+ ("tevent-configure", "cd lib/tevent && " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python", "text/plain"),
+ ("tevent-make", "cd lib/tevent && make", "text/plain"),
+ ("tevent-install", "cd lib/tevent && make install", "text/plain"),
+
+ ("ldb-configure", "cd lib/ldb && " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python", "text/plain"),
+ ("ldb-make", "cd lib/ldb && make", "text/plain"),
+ ("ldb-install", "cd lib/ldb && make install", "text/plain"),
+
+ # retry against installed library packages
+ ("libs-configure", samba_libs_configure_base + samba_libs_configure_bundled_libs + " --disable-python --without-ad-dc", "text/plain"),
+ ("libs-make", "make -j", "text/plain"),
+ ("libs-install", "make install", "text/plain"),
+ ("libs-check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
+ ("libs-clean", "make clean", "text/plain")
],