aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Danny van Dyk <dvandyk@exherbo.org> 2006-12-22 16:48:41 +0000
committerAvatar Danny van Dyk <dvandyk@exherbo.org> 2006-12-22 16:48:41 +0000
commitd0432ce7e47b61a1616cbb77542b7a2eb22a58ed (patch)
tree1c8381d48f8d29f6c423bc4f6fe6841b6a981c49
parent3798f313cfe67ed0047c59d485760e965e1e247c (diff)
downloadpaludis-d0432ce7e47b61a1616cbb77542b7a2eb22a58ed.tar.gz
paludis-d0432ce7e47b61a1616cbb77542b7a2eb22a58ed.tar.xz
Some fixes in regard to contrarius.
-rw-r--r--paludis/environment/default/default_environment.cc4
-rw-r--r--paludis/tasks/stage_builder_task.cc5
-rw-r--r--src/contrarius/contrarius_stage_options.sr24
3 files changed, 30 insertions, 3 deletions
diff --git a/paludis/environment/default/default_environment.cc b/paludis/environment/default/default_environment.cc
index fd0376f..6cbd4c6 100644
--- a/paludis/environment/default/default_environment.cc
+++ b/paludis/environment/default/default_environment.cc
@@ -74,10 +74,10 @@ DefaultEnvironment::query_use(const UseFlagName & f, const PackageDatabaseEntry
u_end(DefaultConfig::get_instance()->end_forced_use_config()) ;
u != u_end ; ++u)
{
- if (u->dep_atom)
+ if (u->flag_name != f)
continue;
- if (u->flag_name != f)
+ if (! match_package(this, *u->dep_atom, *e))
continue;
Log::get_instance()->message(ll_debug, lc_no_context, "Forced use flag: "
diff --git a/paludis/tasks/stage_builder_task.cc b/paludis/tasks/stage_builder_task.cc
index 5b21af5..a60a076 100644
--- a/paludis/tasks/stage_builder_task.cc
+++ b/paludis/tasks/stage_builder_task.cc
@@ -102,8 +102,11 @@ StageBuilderTask::execute()
on_build_skipped(*s);
continue;
}
+
(*s)->build(_imp->options);
- on_build_succeed(*s);
+
+ if (! _imp->options.pretend)
+ on_build_succeed(*s);
}
catch (const StageBuildError & e)
{
diff --git a/src/contrarius/contrarius_stage_options.sr b/src/contrarius/contrarius_stage_options.sr
new file mode 100644
index 0000000..1fa8aa7
--- /dev/null
+++ b/src/contrarius/contrarius_stage_options.sr
@@ -0,0 +1,24 @@
+#!/bin/bash
+# vim: set sw=4 sts=4 et :
+
+make_class_ContrariusStageOptions()
+{
+ key target HostTupleName
+
+ key binutils PackageDepAtom::ConstPointer
+ key gcc PackageDepAtom::ConstPointer
+ key headers PackageDepAtom::ConstPointer
+ key libc PackageDepAtom::ConstPointer
+
+ extra_constructors <<END
+ ContrariusStageOptions(const HostTupleName & target,
+ const std::string & binutils_name,
+ const std::string & binutils_version,
+ const std::string & gcc_name,
+ const std::string & gcc_version,
+ const std::string & headers_name,
+ const std::string & headers_version,
+ const std::string & libc_name,
+ const std::string & libc_version);
+END
+}