diff options
| author | Chris Knadle <Chris.Knadle@coredump.us> | 2019-01-19 08:26:22 +0300 |
|---|---|---|
| committer | Chris Knadle <Chris.Knadle@coredump.us> | 2019-01-19 08:26:22 +0300 |
| commit | 40ba488547b0b4df58ef376d4212ec421893a445 (patch) | |
| tree | 9a825a87427248e2989a6e751ce16ac780e96e92 /qmake | |
| parent | e31d267a11b4ed0597ad41309a7f6b715837141f (diff) | |
qmake/pkgconfig.pri: set PKG_CONFIG to allow making package cross buildable
Patch supplied by Helmut Grohne <helmut@subdivi.de> in Debian bug #919453
https://bugs.debian.org/919453
Instead of calling pkg-config directly, this patch calls pkgConfigExecutable()
from Qt5 to allow setting which pkg-config to be the one the user supplied
for the build to set the architecture to build with.
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/pkgconfig.pri | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/qmake/pkgconfig.pri b/qmake/pkgconfig.pri index ceb8efa71..b435a8bfe 100644 --- a/qmake/pkgconfig.pri +++ b/qmake/pkgconfig.pri @@ -3,6 +3,11 @@ # that can be found in the LICENSE file at the root of the # Mumble source tree or at <https://www.mumble.info/LICENSE>. +# Allow cross-building by making a call to return the pkg-config +# that the user supplied to the build. +# pkgConfigExecutable() is part of Qt5. +PKG_CONFIG = $$pkgConfigExecutable() + # must_pkgconfig(pkg) # # This function checks if the passed-in package @@ -17,7 +22,7 @@ # defineTest(must_pkgconfig) { pkg = $$1 - system(pkg-config --exists $$pkg) { + system($$PKG_CONFIG --exists $$pkg) { PKGCONFIG *= $$pkg export(PKGCONFIG) } else { |