From 4288b2a59959c1693bdbc7cbef849942b721c508 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Sun, 10 Aug 2014 17:41:54 +0100 Subject: Add a work around for trampling over PKG_CONFIG_PATH. The extend_pkg_path method will be removed in 2.2 as it causes problems with non-standard pkg-config paths. This commit adds a workaround until that happens. --- make/utilities.pm | 1 + 1 file changed, 1 insertion(+) (limited to 'make') diff --git a/make/utilities.pm b/make/utilities.pm index 8c8ac0d49..42dd6b547 100644 --- a/make/utilities.pm +++ b/make/utilities.pm @@ -95,6 +95,7 @@ sub make_rpath($;$) sub extend_pkg_path() { + return if defined $ENV{DISABLE_EXTEND_PKG_PATH}; if (!exists $ENV{PKG_CONFIG_PATH}) { $ENV{PKG_CONFIG_PATH} = "/usr/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/libdata/pkgconfig:/usr/X11R6/libdata/pkgconfig"; -- cgit v1.2.3