X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=05bebcc55f929971cb5d1780ba98200b6730bcca;hb=07503a34b80778fe74977f0fb0c2094c92d64ce0;hp=f74b4a09bdda43e905df82ff8584009b2da0b9db;hpb=c51884994862b02613c2c0ae75b1f8d39e0f1ee5;p=builder.git

diff --git a/source/package.cpp b/source/package.cpp
index f74b4a0..05bebcc 100644
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -2,7 +2,6 @@
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
 #include "builder.h"
-#include "misc.h"
 #include "package.h"
 
 using namespace std;
@@ -11,39 +10,40 @@ using namespace Msp;
 Package::Package(Builder &b, const string &n):
 	builder(b),
 	name(n),
-	conf_done(false),
+	prepared(false),
 	use_pkgconfig(true)
 {
 	builder.get_package_manager().add_package(this);
 }
 
-void Package::configure(const StringMap &opts, unsigned flag)
+void Package::prepare()
 {
-	if(conf_done)
+	if(prepared)
 		return;
 
-	builder.get_logger().log("configure", format("Configuring %s", name));
+	for(Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+		(*i)->prepare();
 
-	do_configure(opts, flag);
-
-	requires.sort();
-	requires.unique();
-
-	for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i)
-		(*i)->configure(opts, flag&2);
-
-	create_build_info();
-
-	conf_done = true;
+	do_prepare();
+	prepared = true;
 }
 
 
 Package::Loader::Loader(Package &p):
 	DataFile::ObjectLoader<Package>(p)
 {
+	add("if_arch", &Loader::if_arch);
 	add("require", &Loader::require);
 }
 
+void Package::Loader::if_arch(const string &cond)
+{
+	bool match = obj.builder.get_current_arch().match_name(cond);
+	obj.builder.get_logger().log("configure", format("%s: arch %s %smatched", obj.name, cond, (match ? "" : "not ")));
+	if(match)
+		load_sub_with(*this);
+}
+
 void Package::Loader::require(const string &n)
 {
 	Package *req = obj.builder.get_package_manager().find_package(n);