2016-12-20 23:05:26 +01:00
|
|
|
From 737579eb780ab8a22e075d8032a5ce983d397064 Mon Sep 17 00:00:00 2001
|
2016-09-19 22:18:45 +02:00
|
|
|
From: Martchus <martchus@gmx.net>
|
|
|
|
|
Date: Sun, 18 Sep 2016 18:50:21 +0200
|
2016-12-05 20:32:16 +01:00
|
|
|
Subject: [PATCH 23/26] Use correct pkg-config --static flag
|
2016-09-19 22:18:45 +02:00
|
|
|
|
|
|
|
|
---
|
|
|
|
|
configure | 5 +++++
|
|
|
|
|
1 file changed, 5 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/configure b/configure
|
2016-12-20 23:05:26 +01:00
|
|
|
index 9ecc7f9ada..40db8b196a 100755
|
2016-09-19 22:18:45 +02:00
|
|
|
--- a/configure
|
|
|
|
|
+++ b/configure
|
2016-12-20 23:05:26 +01:00
|
|
|
@@ -4166,6 +4166,11 @@ if [ -z "$PKG_CONFIG" ]; then
|
2016-09-19 22:18:45 +02:00
|
|
|
# See if PKG_CONFIG is set in the mkspec:
|
|
|
|
|
PKG_CONFIG="`"$CFG_QMAKE_PATH" -qtconf "$QTCONFFILE" -E -nocache -spec "$XQMAKESPEC" "CONFIG=" $DEV_NULL 2>&1 | sed -n -e 's,^PKG_CONFIG = \(.*\),\1,p'`"
|
|
|
|
|
[ -n "$PKG_CONFIG" ] && [ "$OPT_VERBOSE" = "yes" ] && echo "Found pkg-config from mkspec: $PKG_CONFIG"
|
|
|
|
|
+
|
|
|
|
|
+ if [ "$CFG_SHARED" = "no" ] ; then
|
|
|
|
|
+ PKG_CONFIG="$PKG_CONFIG --static"
|
|
|
|
|
+ [ "$OPT_VERBOSE" = "yes" ] && echo "Using '$PKG_CONFIG' because we're doing a static build"
|
|
|
|
|
+ fi
|
|
|
|
|
fi
|
|
|
|
|
if [ -z "$PKG_CONFIG" ]; then
|
|
|
|
|
PKG_CONFIG=`"$WHICH" pkg-config 2>/dev/null`
|
|
|
|
|
--
|
2016-12-20 23:05:26 +01:00
|
|
|
2.11.0
|
2016-09-19 22:18:45 +02:00
|
|
|
|
