From: Dmitry Shachnev Date: Wed, 16 Dec 2020 17:26:18 +0000 (+0300) Subject: Pass --reuse-build only to commands that use DistUtilsCommandMixin X-Git-Tag: archive/raspbian/5.15.2-1+rpi1^2~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0a1146c9ac69b23fc0b8e07941f2a4be6268e36e;p=pyside2.git Pass --reuse-build only to commands that use DistUtilsCommandMixin This is a concatenation of two upstream commits: - https://code.qt.io/cgit/pyside/pyside-setup.git/commit/?id=ed0571df854a232e - https://code.qt.io/cgit/pyside/pyside-setup.git/commit/?id=3f00c2adad2e38b0 Gbp-Pq: Name fix-reuse-build.patch --- diff --git a/build_scripts/setup_runner.py b/build_scripts/setup_runner.py index 57c8fbd..3c7116b 100644 --- a/build_scripts/setup_runner.py +++ b/build_scripts/setup_runner.py @@ -88,8 +88,13 @@ class SetupRunner(object): internal_build_type_arg = self.construct_internal_build_type_cmd_line_argument(build_type) setup_cmd = [sys.executable] + self.sub_argv + [internal_build_type_arg] + command = self.sub_argv[0] + if command == 'setup.py' and len(self.sub_argv) > 1: + command = self.sub_argv[1] + # Add --reuse-build option if requested and not already present. - if reuse_build and not self.cmd_line_argument_is_in_args("reuse-build", self.sub_argv): + if (reuse_build and command in ('bdist_wheel', 'build', 'build_rst_docs', 'install') + and not self.cmd_line_argument_is_in_args("reuse-build", self.sub_argv)): setup_cmd.append(self.construct_cmd_line_argument("reuse-build")) self.invocations_list.append(setup_cmd)