#include <msp/io/print.h>
#include <msp/strings/lexicalcast.h>
#include <msp/strings/utils.h>
+#include "booleanevaluator.h"
#include "builder.h"
#include "package.h"
void Package::Loader::if_arch(const string &cond)
{
- bool match = obj.builder.get_current_arch().match_name(cond);
+ BooleanEvaluator eval(sigc::hide<1>(sigc::mem_fun(&obj.builder.get_current_arch(), &Architecture::match_name)), false);
+ bool match = eval.evaluate(cond);
obj.builder.get_logger().log("configure", format("%s: arch %s %smatched", obj.name, cond, (match ? "" : "not ")));
if(match)
load_sub_with(*this);
Package *req = obj.builder.get_package_manager().find_package(n);
if(req)
obj.requires.push_back(req);
+ else
+ obj.problems.push_back(format("Required package %s not found", n));
}