X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=d937daf7d920a7a5bd760ced3a0ad281184e42a4;hb=f1c967215e6b08095bdf07518472beca3067ec37;hp=fcbe9f7a6208fe8c10f3bac150f78d5c6986138c;hpb=59ac0a44d6edf179c01604c6ced744873213f855;p=builder.git

diff --git a/source/package.cpp b/source/package.cpp
index fcbe9f7..d937daf 100644
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -1,3 +1,4 @@
+#include <msp/strconv.h>
 #include <msp/strutils.h>
 #include "builder.h"
 #include "misc.h"
@@ -6,19 +7,6 @@
 using namespace std;
 using namespace Msp;
 
-PackageRef::PackageRef(Builder &b, const string &n):
-	builder(b),
-	name(n),
-	package(0)
-{ }
-
-Package *PackageRef::resolve()
-{
-	if(!package)
-		package=builder.get_package(name);
-	return package;
-}
-
 Package::Package(Builder &b, const string &n, const Path::Path &s):
 	builder(b),
 	name(n),
@@ -79,6 +67,18 @@ void Package::create_build_info()
 	if(flags&LIB)
 		export_binfo.libpath.push_back((Path::Path(config.get_option("prefix").value)/"lib").str());
 
+	string optimize=config.get_option("optimize").value;
+	if(strtol(optimize))
+	{
+		build_info.cflags.push_back("-O"+optimize);
+		string cpu=config.get_option("cpu").value;
+		if(cpu!="auto")
+			build_info.cflags.push_back("-march="+cpu);
+	}
+
+	if(strtobool(config.get_option("debug").value))
+		build_info.cflags.push_back("-ggdb");
+
 	build_info.unique();
 	export_binfo.unique();
 
@@ -94,20 +94,31 @@ void Package::create_build_info()
 
 void Package::process_options(const RawOptionMap &opts)
 {
-	config.process(opts);
+	if(config.process(opts))
+		config.save(source/".options.cache");
 }
 
 Package *Package::create(Builder &b, const string &name)
 {
 	list<string> argv;
 	argv.push_back("pkg-config");
+	argv.push_back("--silence-errors");
 	argv.push_back("--cflags");
 	argv.push_back("--libs");
 	argv.push_back(name);
 	vector<string> info=split(run_command(argv));
 	
 	if(info.empty())
-		return 0;
+	{
+		if(name=="opengl")
+			info.push_back("-lGL");
+		else if(name=="pthread")
+			info.push_back("-lpthread");
+		else if(name=="gmpxx")
+			info.push_back("-lgmpxx");
+		else
+			return 0;
+	}
 	
 	Package *pkg=new Package(b, name, info);
 	return pkg;
@@ -117,9 +128,11 @@ void Package::init_buildable()
 {
 	buildable=true;
 
-	config.add_option("tempdir",  "temp", "Directory for storing temporary files");
-	config.add_option("optimize", "0",    "Apply compiler optimizations");
-	config.add_option("debug",    "0",    "Produce debugging symbols");
+	config.add_option("tempdir",  "temp",   "Directory for storing temporary files");
+	config.add_option("optimize", "0",      "Apply compiler optimizations");
+	config.add_option("debug",    "0",      "Produce debugging symbols");
+	config.add_option("cpu",      "auto",   "CPU type to optimize for");
+	config.add_option("arch",     "native", "Architecture for cross-compiling");
 
 	const char *home=getenv("HOME");
 	unsigned flags=get_install_flags();
@@ -133,6 +146,8 @@ void Package::init_buildable()
 		config.add_option("includedir", "$prefix/lib",     "Library installation directory");
 	if(flags&DATA)
 		config.add_option("includedir", "$prefix/share",   "Data installation directory");*/
+
+	config.load(source/".options.cache");
 }
 
 unsigned Package::get_install_flags()
@@ -162,6 +177,8 @@ Package::Loader::Loader(Package &p):
 	add("require",     &Loader::require);
 	add("program",     &Loader::program);
 	add("library",     &Loader::library);
+	add("headers",     &Loader::headers);
+	add("build_info",  &Loader::build_info);
 }
 
 Package::Loader::~Loader()
@@ -174,16 +191,28 @@ void Package::Loader::require(const string &n)
 	pkg.requires.push_back(PackageRef(pkg.builder, n));
 }
 
-void Package::Loader::program(const std::string &n)
+void Package::Loader::program(const string &n)
 {
 	Component prog(pkg, Component::PROGRAM, n);
 	load_sub(prog);
 	pkg.components.push_back(prog);
 }
 
-void Package::Loader::library(const std::string &n)
+void Package::Loader::library(const string &n)
 {
 	Component prog(pkg, Component::LIBRARY, n);
 	load_sub(prog);
 	pkg.components.push_back(prog);
 }
+
+void Package::Loader::headers(const string &n)
+{
+	Component prog(pkg, Component::HEADERS, n);
+	load_sub(prog);
+	pkg.components.push_back(prog);
+}
+
+void Package::Loader::build_info()
+{
+	load_sub(pkg.build_info);
+}