X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=inline;f=source%2Fpackagemanager.cpp;h=2ee3c30de63f67bca4f649d27326d9b97e05d4f1;hb=3a61505c629d51f52343e7dfaaa936143557c3bf;hp=ee07987d0186e86641cf43cf8aa11f801d3ea18f;hpb=0d95fee118a3fcd78f153dca5721d9fe19b6f6bf;p=builder.git

diff --git a/source/packagemanager.cpp b/source/packagemanager.cpp
index ee07987..2ee3c30 100644
--- a/source/packagemanager.cpp
+++ b/source/packagemanager.cpp
@@ -5,7 +5,7 @@
 #include <msp/io/print.h>
 #include <msp/strings/format.h>
 #include <msp/strings/utils.h>
-#include <msp/time/units.h>
+#include <msp/time/timedelta.h>
 #include <msp/time/utils.h>
 #include "binarypackage.h"
 #include "builder.h"
@@ -109,8 +109,10 @@ Package *PackageManager::find_package(const string &name)
 	{
 		// Package source not found - create a binary package
 		string flags_str = run_pkgconfig(name, "flags");
-		vector<string> 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;
 	}
@@ -123,6 +125,7 @@ Package *PackageManager::find_package(const string &name)
 
 string PackageManager::run_pkgconfig(const string &pkg, const string &what)
 {
+#ifndef _WIN32
 	if(!env_set)
 	{
 		const FS::Path &prefix = builder.get_prefix();
@@ -150,10 +153,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);
@@ -162,6 +167,11 @@ string PackageManager::run_pkgconfig(const string &pkg, const string &what)
 	builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
 
 	return ExternalTask::run_and_capture_output(argv);
+#else
+	(void)pkg;
+	(void)what;
+	return string();
+#endif
 }
 
 FS::Path PackageManager::get_package_location(const string &name)