From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 16 Jul 2012 20:46:26 +0000 (+0300)
Subject: Let PackageManager take care of PKG_CONFIG_PATH
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=3b13563d75a8fd711a9cf87cae62960f90a5bc39;p=builder.git

Let PackageManager take care of PKG_CONFIG_PATH
---

diff --git a/source/builder.cpp b/source/builder.cpp
index 122e1b9..ff2f952 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -1,5 +1,4 @@
 #include <set>
-#include <cstdlib>
 #include <msp/core/getopt.h>
 #include <msp/datafile/parser.h>
 #include <msp/fs/dir.h>
@@ -230,25 +229,6 @@ Builder::~Builder()
 
 int Builder::main()
 {
-	if(prefix.str()!="/usr")
-	{
-		FS::Path pcdir = prefix/"lib"/"pkgconfig";
-		if(const char *pcp = getenv("PKG_CONFIG_PATH"))
-		{
-			vector<string> path = split(pcp, ':');
-			bool found = false;
-			for(vector<string>::const_iterator i=path.begin(); (!found && i!=path.end()); ++i)
-				found = (*i==pcdir.str());
-			if(!found)
-			{
-				path.push_back(pcdir.str());
-				setenv("PKG_CONFIG_PATH", join(path.begin(), path.end(), ":").c_str(), true);
-			}
-		}
-		else
-			setenv("PKG_CONFIG_PATH", pcdir.str().c_str(), true);
-	}
-
 	if(load_build_file(cwd/build_file))
 	{
 		if(help)
diff --git a/source/packagemanager.cpp b/source/packagemanager.cpp
index 01c9e09..730f022 100644
--- a/source/packagemanager.cpp
+++ b/source/packagemanager.cpp
@@ -1,3 +1,4 @@
+#include <cstdlib>
 #include <msp/fs/dir.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
@@ -17,7 +18,8 @@ using namespace Msp;
 
 PackageManager::PackageManager(Builder &b):
 	builder(b),
-	no_externals(false)
+	no_externals(false),
+	env_set(false)
 {
 	pkg_path.push_back(builder.get_cwd()/".");
 	pkg_path.push_back(builder.get_cwd()/"..");
@@ -87,6 +89,29 @@ Package *PackageManager::find_package(const string &name)
 
 string PackageManager::run_pkgconfig(const string &pkg, const string &what)
 {
+	if(!env_set)
+	{
+		const FS::Path &prefix = builder.get_prefix();
+		if(prefix.str()!="/usr")
+		{
+			FS::Path pcdir = prefix/"lib/pkgconfig";
+			if(const char *pcp = getenv("PKG_CONFIG_PATH"))
+			{
+				vector<string> path = split(pcp, ':');
+				bool found = false;
+				for(vector<string>::const_iterator i=path.begin(); (!found && i!=path.end()); ++i)
+					found = (*i==pcdir.str());
+				if(!found)
+				{
+					path.push_back(pcdir.str());
+					setenv("PKG_CONFIG_PATH", join(path.begin(), path.end(), ":").c_str(), true);
+				}
+			}
+			else
+				setenv("PKG_CONFIG_PATH", pcdir.str().c_str(), true);
+		}
+	}
+
 	ExternalTask::Arguments argv;
 	argv.push_back("pkg-config");
 	if(what=="cflags" || what=="libs")
diff --git a/source/packagemanager.h b/source/packagemanager.h
index 3484687..4017065 100644
--- a/source/packagemanager.h
+++ b/source/packagemanager.h
@@ -26,6 +26,7 @@ private:
 	SearchPath pkg_dirs;
 	bool no_externals;
 	PackageMap packages;
+	bool env_set;
 
 public:
 	PackageManager(Builder &);