On Thu, 23 Jan 2020, Thorsten Glaser wrote: > Patch also attached.
Gah. Now. commit be2c57234711edd703e6ff64abcf0288dad2afb7 Author: mirabilos <[email protected]> Date: Thu Jan 23 15:41:01 2020 +0100 Allow explicitly setting buildsystem to “none” Closes: #949635 Signed-off-by: mirabilos <[email protected]> diff --git a/debhelper.pod b/debhelper.pod index 6db95abc..6198c5f0 100644 --- a/debhelper.pod +++ b/debhelper.pod @@ -320,6 +320,8 @@ B<dh_auto_>I<*> programs. Force use of the specified I<buildsystem>, instead of trying to auto-select one which might be applicable for the package. +Pass B<none> as I<buildsystem> to disable auto-selection. + =item B<-D>I<directory>, B<--sourcedir=>I<directory>, B<--sourcedirectory=>I<directory> Assume that the original package source tree is at the specified diff --git a/lib/Debian/Debhelper/Dh_Buildsystems.pm b/lib/Debian/Debhelper/Dh_Buildsystems.pm index ed4b91c5..43017ea5 100644 --- a/lib/Debian/Debhelper/Dh_Buildsystems.pm +++ b/lib/Debian/Debhelper/Dh_Buildsystems.pm @@ -91,9 +91,9 @@ sub autoselect_buildsystem { return $selected; } -# Similar to create_build system_instance(), but it attempts to autoselect -# a build system if none was specified. In case autoselection fails, undef -# is returned. +# Similar to create_buildsystem_instance(), but it attempts to autoselect +# a build system if none was specified. In case autoselection fails or an +# explicit “none” is requested, undef is returned. sub load_buildsystem { my $system=shift; my $step=shift; @@ -104,6 +104,7 @@ sub load_buildsystem { $system = $system_options->{'system'}; } if (defined $system) { + return undef if $system eq 'none'; my $inst = create_buildsystem_instance($system, 1, %opts); return $inst; } //mirabilos -- tarent solutions GmbH Rochusstraße 2-4, D-53123 Bonn • http://www.tarent.de/ Tel: +49 228 54881-393 • Fax: +49 228 54881-235 HRB 5168 (AG Bonn) • USt-ID (VAT): DE122264941 Geschäftsführer: Dr. Stefan Barth, Kai Ebenrett, Boris Esser, Alexander Steeg ********** Mit der tarent Academy bieten wir auch Trainings und Schulungen in den Bereichen Softwareentwicklung, Agiles Arbeiten und Zukunftstechnologien an. Besuchen Sie uns auf www.tarent.de/academy. Wir freuen uns auf Ihren Kontakt. **********
