Fix a bug in condition evaluation

[builder.git] / source / sourcepackage.h

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index 0745a1b1614389643e5bf6ffc3936283a08bddc1..5218592ff9d0a0743957b17bf24e70fbe8cf2315 100644 (file)
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -27,10 +27,10 @@ class SourcePackage: public Package
 public:
        enum InstallFlags
        {
-               INCLUDE=1,
-               BIN=2,
-               LIB=4,
-               DATA=8
+               INCLUDE = 1,
+               BIN = 2,
+               LIB = 4,
+               DATA = 8
        };
 
        class Loader: public Package::Loader
@@ -54,13 +54,11 @@ private:
        std::string description;
 
        Msp::FS::Path source;
-       PackageList base_reqs;
        FeatureList features;
        BuildInfo build_info;
        ConditionList conditions;
        ComponentList components;
        Config config;
-       bool conf_done;
        mutable DependencyCache deps_cache;
 
 public:
@@ -83,6 +81,7 @@ public:
 
        LibMode get_library_mode() const;
        DependencyCache &get_deps_cache() const { return deps_cache; }
+       std::string expand_string(const std::string &) const;
 private:
        virtual void do_configure(const StringMap &, unsigned);