folkslinux
/
dnf5
mirror of https://github.com/rpm-software-management/dnf5.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

builddep: Support the --with/--without options to toggle bconds 

This adds the same options used by rpmbuild, mock, etc. for setting
macros to flip build-time conditional switches when parsing spec
files.  It provides a consistent interface across related tools.
This commit is contained in:
David Michael 2024-05-26 15:59:51 -04:00 committed by amatej
parent 1be56c542c
commit 62b8ffbc09
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dnf5-plugins/builddep_plugin/builddep.cpp
View File

@ -85,6 +85,36 @@ void BuildDepCommand::set_argument_parser() {
});
cmd.register_named_arg(defs);
auto with_bconds = parser.add_new_named_arg("with_bconds");
with_bconds->set_long_name("with");
with_bconds->set_has_value(true);
with_bconds->set_arg_value_help("OPTION");
with_bconds->set_description(
"Enable conditional build OPTION when parsing spec files. "
"Does not apply for source rpm files.");
with_bconds->set_parse_hook_func(
[this](
[[maybe_unused]] ArgumentParser::NamedArg * arg, [[maybe_unused]] const char * option, const char * value) {
rpm_macros.emplace_back("_with_" + std::string(value), "--with-" + std::string(value));
return true;
});
cmd.register_named_arg(with_bconds);
auto without_bconds = parser.add_new_named_arg("without_bconds");
without_bconds->set_long_name("without");
without_bconds->set_has_value(true);
without_bconds->set_arg_value_help("OPTION");
without_bconds->set_description(
"Disable conditional build OPTION when parsing spec files. "
"Does not apply for source rpm files.");
without_bconds->set_parse_hook_func(
[this](
[[maybe_unused]] ArgumentParser::NamedArg * arg, [[maybe_unused]] const char * option, const char * value) {
rpm_macros.emplace_back("_without_" + std::string(value), "--without-" + std::string(value));
return true;
});
cmd.register_named_arg(without_bconds);
allow_erasing = std::make_unique<AllowErasingOption>(*this);
auto skip_unavailable = std::make_unique<SkipUnavailableOption>(*this);
create_allow_downgrade_options(*this);
@ -240,7 +270,8 @@ void BuildDepCommand::run() {
}
} else {
if (srpm_file_paths.size() > 0 && rpm_macros.size() > 0) {
std::cerr << "Warning: -D or --define arguments have no meaning for source rpm packages." << std::endl;
std::cerr << "Warning: -D/--define/--with/--without arguments have no effect on source rpm packages."
<< std::endl;
}
}

6
doc/dnf5_plugins/builddep.8.rst
View File

@ -44,6 +44,9 @@ Options
``-D "macro expr", --define="macro expr"``
| Define a rpm macro. Set the value "expr" to the macro "macro" when parsing spec files. Does not apply for source rpm files.
``--with=OPTION, --without=OPTION``
| Enable or disable conditional build OPTION when parsing spec files. Does not apply for source rpm files.
``--allowerasing``
| Allow erasing of installed packages to resolve any potential dependency problems.
@ -78,3 +81,6 @@ Examples
``dnf builddep -D 'scl python27' python-foobar.spec``
| Install the needed build requirements for the python27 SCL version of python-foobar.
``dnf builddep --without=selinux foobar.spec``
| Install the needed build requirements except those for optional SELinux support.