Add patch to allow overriding of pkg-config in generated Makefiles

diff --git a/debian/patches/overridable_pkg-config.patch b/debian/patches/overridable_pkg-config.patch
new file mode 100644 (file)
index 0000000..89e6141
--- /dev/null
+++ b/debian/patches/overridable_pkg-config.patch
@@ -0,0 +1,60 @@
+From: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
+Date: Mon, 16 Mar 2020 13:32:21 +0100
+Subject: 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
+---
+ .../Source/ProjectSaving/jucer_ProjectExport_Make.h         | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h
+index 2752788..2a5aa9f 100644
+--- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h
++++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h
+@@ -246,8 +246,8 @@ public:
+ \r
+             if (! packages.isEmpty())\r
+             {\r
+-                out << "\t@command -v pkg-config >/dev/null 2>&1 || { echo >&2 \"pkg-config not installed. Please, install it.\"; exit 1; }" << newLine\r
+-                    << "\t@pkg-config --print-errors";\r
++                out << "\t@command -v $(PKG_CONFIG) >/dev/null 2>&1 || { echo >&2 \"pkg-config not installed. Please, install it.\"; exit 1; }" << newLine\r
++                    << "\t@$(PKG_CONFIG) --print-errors";\r
+ \r
+                 for (auto& pkg : packages)\r
+                     out << " " << pkg;\r
+@@ -507,7 +507,7 @@ private:
+         auto packages = getPackages();\r
+ \r
+         if (packages.size() > 0)\r
+-            return "$(shell pkg-config --cflags " + packages.joinIntoString (" ") + ")";\r
++            return "$(shell $(PKG_CONFIG) --cflags " + packages.joinIntoString (" ") + ")";\r
+ \r
+         return {};\r
+     }\r
+@@ -517,7 +517,7 @@ private:
+         auto packages = getPackages();\r
+ \r
+         if (packages.size() > 0)\r
+-            return "$(shell pkg-config --libs " + packages.joinIntoString (" ") + ")";\r
++            return "$(shell $(PKG_CONFIG) --libs " + packages.joinIntoString (" ") + ")";\r
+ \r
+         return {};\r
+     }\r
+@@ -912,6 +912,11 @@ private:
+             << "endif"         << newLine\r
+             << newLine;\r
+ \r
++        out << "ifndef PKG_CONFIG"  << newLine\r
++            << "  PKG_CONFIG=pkg-config" << newLine\r
++            << "endif"         << newLine\r
++            << newLine;\r
++\r
+         out << "ifndef AR" << newLine\r
+             << "  AR=ar"   << newLine\r
+             << "endif"     << newLine\r

diff --git a/debian/patches/series b/debian/patches/series
index d57bbe87d44724c1dd142fd97a1bcf3cff4e38cf..91be27dc2517ac2c909d1e5fec9c6cd851f38207 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ debian_vst.patch
 debian_link_systemlibs.patch
 0011-Don-t-fail-fatally-if-gui-cannot-connect-to-X-server.patch
 cross.patch
+overridable_pkg-config.patch