diff options
| author | Tim Beale <timbeale@catalyst.net.nz> | 2019-02-15 11:58:51 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-02-15 04:35:23 +0100 |
| commit | e11969def18cb0ea803bc4a0ea2eb0fdfed8edee (patch) | |
| tree | dc96e7f8489154a55934c3180a32f4223c1d4ffc /script/autobuild.py | |
| parent | 9124e44d71009861875bd94ead53c8e680757882 (diff) | |
| download | samba-e11969def18cb0ea803bc4a0ea2eb0fdfed8edee.tar.gz | |
autobuild: Remove ${EXTRA_PYTHON} variable
We no longer build the python2 bindings, only python3. So we can get rid
of this variable now.
Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'script/autobuild.py')
| -rwxr-xr-x | script/autobuild.py | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/script/autobuild.py b/script/autobuild.py index efaf884a628..2d37cffbd5d 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -65,20 +65,15 @@ if os.environ.get("AUTOBUILD_SKIP_SAMBA_O3", "0") == "1": defaulttasks.remove("samba-o3") ctdb_configure_params = " --enable-developer --picky-developer ${PREFIX}" -samba_configure_params = " --picky-developer ${PREFIX} ${EXTRA_PYTHON} --with-profiling-data" +samba_configure_params = " --picky-developer ${PREFIX} --with-profiling-data" samba_libs_envvars = "PYTHONPATH=${PYTHON_PREFIX}:$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,popt,NONE ${EXTRA_PYTHON}" +samba_libs_configure_libs = samba_libs_configure_base + " --bundled-libraries=cmocka,popt,NONE" 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": - extra_python = "" -else: - extra_python = "--extra-python=/usr/bin/python2" +samba_libs_configure_samba = samba_libs_configure_base + samba_libs_configure_bundled_libs tasks = { "ctdb": [("random-sleep", "../script/random-sleep.sh 60 600", "text/plain"), @@ -346,11 +341,11 @@ tasks = { "ldb": [ ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"), - ("configure", "./configure --enable-developer -C ${PREFIX} ${EXTRA_PYTHON}", "text/plain"), + ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"), ("make", "make", "text/plain"), ("install", "make install", "text/plain"), ("test", "make test", "text/plain"), - ("configure-no-lmdb", "./configure --enable-developer --without-ldb-lmdb -C ${PREFIX} ${EXTRA_PYTHON}", "text/plain"), + ("configure-no-lmdb", "./configure --enable-developer --without-ldb-lmdb -C ${PREFIX}", "text/plain"), ("make-no-lmdb", "make", "text/plain"), ("install-no-lmdb", "make install", "text/plain"), ("check-clean-tree", "../../script/clean-source-tree.sh", "text/plain"), @@ -359,7 +354,7 @@ tasks = { "tdb": [ ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"), - ("configure", "./configure --enable-developer -C ${PREFIX} ${EXTRA_PYTHON}", "text/plain"), + ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"), ("make", "make", "text/plain"), ("install", "make install", "text/plain"), ("test", "make test", "text/plain"), @@ -369,7 +364,7 @@ tasks = { "talloc": [ ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"), - ("configure", "./configure --enable-developer -C ${PREFIX} ${EXTRA_PYTHON}", "text/plain"), + ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"), ("make", "make", "text/plain"), ("install", "make install", "text/plain"), ("test", "make test", "text/plain"), @@ -389,7 +384,7 @@ tasks = { "tevent": [ ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"), - ("configure", "./configure --enable-developer -C ${PREFIX} ${EXTRA_PYTHON}", "text/plain"), + ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"), ("make", "make", "text/plain"), ("install", "make install", "text/plain"), ("test", "make test", "text/plain"), @@ -487,10 +482,6 @@ class builder(object): (self.stage, self.cmd, self.output_mime_type) = self.sequence[self.next] self.cmd = self.cmd.replace("${PYTHON_PREFIX}", get_python_lib(plat_specific=1, standard_lib=0, prefix=self.prefix)) self.cmd = self.cmd.replace("${PREFIX}", "--prefix=%s" % self.prefix) - if self.py2: - self.cmd = self.cmd.replace("${EXTRA_PYTHON}", "%s" % extra_python) - else: - self.cmd = self.cmd.replace("${EXTRA_PYTHON}", "") self.cmd = self.cmd.replace("${PREFIX_DIR}", "%s" % self.prefix) self.cmd = self.cmd.replace("${TESTS}", options.restrict_tests) # if self.output_mime_type == "text/x-subunit": |