From 4f2f705dca385ebf8ba718c7b58462c4349d3d29 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 28 Aug 2021 22:38:02 +0200 Subject: [PATCH] build/python/make: rename build() to build_make() Eliminate conflict with other Project classes. --- python/build/autotools.py | 4 ++-- python/build/makeproject.py | 2 +- python/build/openssl.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python/build/autotools.py b/python/build/autotools.py index 9abd418ff..b9db58e51 100644 --- a/python/build/autotools.py +++ b/python/build/autotools.py @@ -59,6 +59,6 @@ class AutotoolsProject(MakeProject): build = self.configure(toolchain) if self.subdirs is not None: for subdir in self.subdirs: - MakeProject.build(self, toolchain, os.path.join(build, subdir)) + self.build_make(toolchain, os.path.join(build, subdir)) else: - MakeProject.build(self, toolchain, build) + self.build_make(toolchain, build) diff --git a/python/build/makeproject.py b/python/build/makeproject.py index fe676bfa4..667a10243 100644 --- a/python/build/makeproject.py +++ b/python/build/makeproject.py @@ -22,7 +22,7 @@ class MakeProject(Project): subprocess.check_call(['/usr/bin/make'] + args, cwd=wd, env=toolchain.env) - def build(self, toolchain, wd, install=True): + def build_make(self, toolchain, wd, install=True): self.make(toolchain, wd, self.get_make_args(toolchain)) if install: self.make(toolchain, wd, self.get_make_install_args(toolchain)) diff --git a/python/build/openssl.py b/python/build/openssl.py index ecf88d4e2..0eaea95a7 100644 --- a/python/build/openssl.py +++ b/python/build/openssl.py @@ -58,4 +58,4 @@ class OpenSSLProject(MakeProject): openssl_arch, '--prefix=' + toolchain.install_prefix], cwd=src, env=toolchain.env) - MakeProject.build(self, toolchain, src) + self.build_make(toolchain, src)