- return source/config.get_option("tempdir").value/builder.get_current_arch().get_name()/config.get_option("profile").value;
+ string subdir = format("%s.%s", builder.get_current_arch().get_name(), config.get_option("profile").value);
+ return source/config.get_option("tempdir").value/subdir;
for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
if(i->get_install())
{
if(i->get_type()==Component::PROGRAM)
for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
if(i->get_install())
{
if(i->get_type()==Component::PROGRAM)
requires.insert(requires.end(), reqs.begin(), reqs.end());
}
for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i)
{
requires.insert(requires.end(), reqs.begin(), reqs.end());
}
for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i)
{
config.add_option("profile", "default", "Configuration profile");
config.add_option("tempdir", "temp", "Directory for storing temporary files");
config.add_option("outdir", ".", "Directory to put build results in");
config.add_option("profile", "default", "Configuration profile");
config.add_option("tempdir", "temp", "Directory for storing temporary files");
config.add_option("outdir", ".", "Directory to put build results in");
config.add_option("strip", "no", "Strip symbols from programs");
config.add_option("debug", "no", "Produce debugging symbols");
config.add_option("strip", "no", "Strip symbols from programs");
config.add_option("debug", "no", "Produce debugging symbols");
config.add_option("staticlibs", "local", "Use static libraries");
for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
config.add_option("staticlibs", "local", "Use static libraries");
for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
if(bpkg && bpkg->get_need_path())
config.add_option(bpkg->get_name()+"_path", "/usr", "Path for "+bpkg->get_name());
}
if(bpkg && bpkg->get_need_path())
config.add_option(bpkg->get_name()+"_path", "/usr", "Path for "+bpkg->get_name());
}
build_info.incpath.push_back((builder.get_prefix()/"include").str());
build_info.libpath.push_back((builder.get_prefix()/"lib").str());
build_info.incpath.push_back((builder.get_prefix()/"include").str());
build_info.libpath.push_back((builder.get_prefix()/"lib").str());
if(lexical_cast<unsigned>(optimize))
{
build_info.cflags.push_back("-O"+optimize);
build_info.ldflags.push_back("-O"+optimize);
if(lexical_cast<unsigned>(optimize))
{
build_info.cflags.push_back("-O"+optimize);
build_info.ldflags.push_back("-O"+optimize);
Component comp(spkg, t, n);
load_sub(comp);
spkg.components.push_back(comp);
Component comp(spkg, t, n);
load_sub(comp);
spkg.components.push_back(comp);
void SourcePackage::Loader::tar_file(const string &f)
{
IO::print("%s: Note: tar_file is deprecated\n", get_source());
void SourcePackage::Loader::tar_file(const string &f)
{
IO::print("%s: Note: tar_file is deprecated\n", get_source());
for(ComponentList::iterator i=spkg.components.begin(); i!=spkg.components.end(); ++i)
if(i->get_type()==Component::TARBALL && i->get_name()=="@src")
const_cast<PathList &>(i->get_sources()).push_back(spkg.source/f);
for(ComponentList::iterator i=spkg.components.begin(); i!=spkg.components.end(); ++i)
if(i->get_type()==Component::TARBALL && i->get_name()=="@src")
const_cast<PathList &>(i->get_sources()).push_back(spkg.source/f);