From 2ba5fb20318580e0dad58357a7c9eb947a42f008 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 27 Jul 2018 15:50:15 +1200 Subject: [PATCH] autobuild: Test with and without building bundled popt Signed-off-by: Andrew Bartlett Reviewed-by: Martin Schwenke Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Sat Jul 28 03:39:48 CEST 2018 on sn-devel-144 --- script/autobuild.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/autobuild.py b/script/autobuild.py index f8b100e2cda..19a511398b2 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -81,8 +81,8 @@ 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}" -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_libs = samba_libs_configure_base + " --bundled-libraries=cmocka,popt,NONE ${EXTRA_PYTHON}" +samba_libs_configure_bundled_libs = " --bundled-libraries=!talloc,!pytalloc-util,!tdb,!pytdb,!ldb,!pyldb,!pyldb-util,!tevent,!pytevent,!popt" 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":