From: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Date: Mon, 16 Mar 2020 12:32:21 +0000 (+0100)
Subject: Allow overridable pkg-config in generated Makefiles
X-Git-Tag: archive/raspbian/6.1.6_ds0-1+rpi1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=136ca30add718d41280b780b74e650a8bc3f4159;p=juce.git

Allow overridable pkg-config in generated Makefiles

Origin: Debian
Bug: https://github.com/WeAreROLI/JUCE/issues/677
Last-Update: 2020-03-16

E.g. to allow cross-building of juce-packages.
See also https://bugs.debian.org/951684
Last-Update: 2020-03-16

Gbp-Pq: Name overridable_pkg-config.patch
---

diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h
index a76c3f25..fc81d9b9 100644
--- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h
+++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h
@@ -306,8 +306,8 @@ public:
 
             if (! packages.isEmpty())
             {
-                out << "\t@command -v pkg-config >/dev/null 2>&1 || { echo >&2 \"pkg-config not installed. Please, install it.\"; exit 1; }" << newLine
-                    << "\t@pkg-config --print-errors";
+                out << "\t@command -v $(PKG_CONFIG) >/dev/null 2>&1 || { echo >&2 \"$(PKG_CONFIG) not installed. Please, install it.\"; exit 1; }" << newLine
+                    << "\t@$(PKG_CONFIG) --print-errors";
 
                 for (auto& pkg : packages)
                     out << " " << pkg;
@@ -562,7 +562,7 @@ private:
         auto compilePackages = getCompilePackages();
 
         if (compilePackages.size() > 0)
-            return "$(shell pkg-config --cflags " + compilePackages.joinIntoString (" ") + ")";
+            return "$(shell $(PKG_CONFIG) --cflags " + compilePackages.joinIntoString (" ") + ")";
 
         return {};
     }
@@ -572,7 +572,7 @@ private:
         auto linkPackages = getLinkPackages();
 
         if (linkPackages.size() > 0)
-            return "$(shell pkg-config --libs " + linkPackages.joinIntoString (" ") + ")";
+            return "$(shell $(PKG_CONFIG) --libs " + linkPackages.joinIntoString (" ") + ")";
 
         return {};
     }
@@ -943,6 +943,11 @@ private:
             << "endif"         << newLine
             << newLine;
 
+        out << "ifndef PKG_CONFIG"  << newLine
+            << "  PKG_CONFIG=pkg-config" << newLine
+            << "endif"         << newLine
+            << newLine;
+
         out << "ifndef AR" << newLine
             << "  AR=ar"   << newLine
             << "endif"     << newLine