From e7e0c46e5cf56ee06495ec4ec0a67cb540d854fe Mon Sep 17 00:00:00 2001 From: "Timur I. Bakeyev" Date: Fri, 18 May 2018 04:07:14 +0800 Subject: [PATCH 1/4] Fix configuration of the ldb with the --disable-python. Signed-off-by: Timur I. Bakeyev --- lib/ldb/wscript | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/ldb/wscript b/lib/ldb/wscript index 0a4eea86c6e..b31e2cf5d81 100644 --- a/lib/ldb/wscript +++ b/lib/ldb/wscript @@ -127,9 +127,15 @@ def build(bld): bld.RECURSE('lib/tdb') if bld.env.standalone_ldb: + if not 'PACKAGE_VERSION' in bld.env: + bld.env.PACKAGE_VERSION = VERSION + bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' private_library = False else: private_library = True + # we're not currently linking against the ldap libs, but ldb.pc.in + # has @LDAP_LIBS@ + bld.env.LDAP_LIBS = '' LDB_MAP_SRC = bld.SUBDIR('ldb_map', 'ldb_map.c ldb_map_inbound.c ldb_map_outbound.c') @@ -150,13 +156,6 @@ def build(bld): if bld.PYTHON_BUILD_IS_ENABLED(): if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'): for env in bld.gen_python_environments(['PKGCONFIGDIR']): - # we're not currently linking against the ldap libs, but ldb.pc.in - # has @LDAP_LIBS@ - bld.env.LDAP_LIBS = '' - - if not 'PACKAGE_VERSION' in bld.env: - bld.env.PACKAGE_VERSION = VERSION - bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' name = bld.pyembed_libname('pyldb-util') bld.SAMBA_LIBRARY(name, From 5fb22e11d02b31feb0c15472a903e6fd963f84ec Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 10 May 2018 09:09:56 +1200 Subject: [PATCH 2/4] autobuild: cover the Gentoo case with python disabled all down the stack Signed-off-by: Andrew Bartlett --- script/autobuild.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/script/autobuild.py b/script/autobuild.py index 65b89d1b40a..5863c33d02d 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -275,6 +275,29 @@ ("install", "make install", "text/plain"), ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"), ("clean", "make clean", "text/plain") + + ("talloc-configure", "cd lib/talloc && " + samba_libs_configure_libs + ' --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_libs + ' --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_libs + ' --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_libs + ' --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", "./configure.developer --picky-developer ${PREFIX} --with-profiling-data --disable-python --without-ad-dc " + samba_libs_configure_libs, "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") ], From ac91f9e9c88f30db6377782b336f9f2c2073e63b Mon Sep 17 00:00:00 2001 From: "Timur I. Bakeyev" Date: Fri, 18 May 2018 06:15:47 +0800 Subject: [PATCH 3/4] Fixed missing comma in the autobuild call options. Signed-off-by: Timur I. Bakeyev --- script/autobuild.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/autobuild.py b/script/autobuild.py index 5863c33d02d..abcc298a7b7 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -274,7 +274,7 @@ ("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_libs + ' --disable-python', "text/plain"), ("talloc-make", "cd lib/talloc && make", "text/plain"), From 1c106a670f7c336f3bf65d31336f1152176d679c Mon Sep 17 00:00:00 2001 From: "Timur I. Bakeyev" Date: Fri, 18 May 2018 07:45:02 +0800 Subject: [PATCH 4/4] Remove EXTRA_PYTHON from the `samba_libs_configure_base` set of options, adding it only for the relevant tests. Signed-off-by: Timur I. Bakeyev --- script/autobuild.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/script/autobuild.py b/script/autobuild.py index abcc298a7b7..ece011b25f3 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -80,9 +80,9 @@ 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_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" -samba_libs_configure_samba = samba_libs_configure_base + " --bundled-libraries=!talloc,!pytalloc-util,!tdb,!pytdb,!ldb,!pyldb,!pyldb-util,!tevent,!pytevent" +samba_libs_configure_samba = samba_libs_configure_base + " ${EXTRA_PYTHON} --bundled-libraries=!talloc,!pytalloc-util,!tdb,!pytdb,!ldb,!pyldb,!pyldb-util,!tevent,!pytevent" if os.environ.get("AUTOBUILD_NO_EXTRA_PYTHON", "0") == "1": extra_python = "" @@ -198,19 +198,19 @@ "samba-libs" : [ ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"), - ("talloc-configure", "cd lib/talloc && " + samba_libs_configure_libs, "text/plain"), + ("talloc-configure", "cd lib/talloc && " + samba_libs_configure_libs + " ${EXTRA_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_libs, "text/plain"), + ("tdb-configure", "cd lib/tdb && " + samba_libs_configure_libs + " ${EXTRA_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_libs, "text/plain"), + ("tevent-configure", "cd lib/tevent && " + samba_libs_configure_libs + " ${EXTRA_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_libs, "text/plain"), + ("ldb-configure", "cd lib/ldb && " + samba_libs_configure_libs + " ${EXTRA_PYTHON}", "text/plain"), ("ldb-make", "cd lib/ldb && make", "text/plain"), ("ldb-install", "cd lib/ldb && make install", "text/plain"),