X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackagemanager.cpp;h=2319c5a906022ffab072e09eb87531e888d08d95;hb=21ca3e98081c0dc0430d8e5301591aa71ec4fca2;hp=f840ea22d4edb929624097f3c47fad0a896bf1ae;hpb=c45cc6fd2b13513909d43b5f95370b00c8b4c25e;p=builder.git diff --git a/source/packagemanager.cpp b/source/packagemanager.cpp index f840ea2..2319c5a 100644 --- a/source/packagemanager.cpp +++ b/source/packagemanager.cpp @@ -109,14 +109,15 @@ Package *PackageManager::find_package(const string &name) { // Package source not found - create a binary package string flags_str = run_pkgconfig(name, "flags"); - vector flags = split(flags_str); - Package *pkg = BinaryPackage::from_flags(builder, name, flags); + BinaryPackage::Flags flags = split(flags_str); + flags_str = run_pkgconfig(name, "staticflags"); + BinaryPackage::Flags static_flags = split(flags_str); + Package *pkg = BinaryPackage::from_flags(builder, name, flags, static_flags); packages.insert(PackageMap::value_type(name, pkg)); return pkg; } catch(...) { - builder.problem(name, "not found"); not_found.insert(name); return 0; } @@ -151,10 +152,12 @@ string PackageManager::run_pkgconfig(const string &pkg, const string &what) argv.push_back("pkg-config"); if(what=="cflags" || what=="libs") argv.push_back("--"+what); - else if(what=="flags") + else if(what=="flags" || what=="staticflags") { argv.push_back("--cflags"); argv.push_back("--libs"); + if(what=="staticflags") + argv.push_back("--static"); } else argv.push_back("--variable="+what); @@ -244,3 +247,9 @@ FS::Path PackageManager::get_binary_package_file(const string &name) return FS::Path(); } + +void PackageManager::save_all_caches() const +{ + for(PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) + i->second->save_caches(); +}