X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=8fb2b4dde4ffe8dda0e0b2507aca1174ca7ee968;hb=8bc8db44c47cd2906c57dccbfb589e41eff7f694;hp=372cf2807be01997fed3733c81cc81d558516a03;hpb=bb5c048950a011f181cb3235ed2b0b2677869171;p=builder.git diff --git a/source/package.cpp b/source/package.cpp index 372cf28..8fb2b4d 100644 --- a/source/package.cpp +++ b/source/package.cpp @@ -26,6 +26,7 @@ Package::Package(Builder &b, const string &n, const Path::Path &s): source(s), config(*this), conf_done(false), + deps_cache(*this), use_pkgconfig(true), need_path(false) { @@ -167,6 +168,8 @@ void Package::configure(const StringMap &opts, unsigned flag) (*i)->set_path(config.get_option((*i)->get_name()+"_path").value); (*i)->configure(opts, flag&2); } + + deps_cache.load(); } create_build_info(); @@ -225,7 +228,8 @@ Package::Package(Builder &b, const string &n, const vector &info): name(n), buildable(false), config(*this), - conf_done(false) + conf_done(false), + deps_cache(*this) { for(vector::const_iterator i=info.begin(); i!=info.end(); ++i) { @@ -358,6 +362,7 @@ void Package::create_build_info() export_binfo.unique(); } + Package::Loader::Loader(Package &p): pkg(p) {