blob: 356037840ffa51309dffc64f926be7e907d5e3dd (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
From 737579eb780ab8a22e075d8032a5ce983d397064 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:50:21 +0200
Subject: [PATCH 23/26] Use correct pkg-config --static flag
---
configure | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/configure b/configure
index 9ecc7f9ada..40db8b196a 100755
--- a/configure
+++ b/configure
@@ -4166,6 +4166,11 @@ if [ -z "$PKG_CONFIG" ]; then
# 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`
--
2.11.0
|