|
| 1 | +From e4cd019345a7c0748acbbd55f9b3631a189b4342 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Jonas Karlman <jonas@kwiboo.se> |
| 3 | +Date: Wed, 15 Jan 2020 18:37:45 +0000 |
| 4 | +Subject: [PATCH] use sysroot path for pkgconfig and libtool |
| 5 | + |
| 6 | +--- |
| 7 | + qtbase/mkspecs/features/qt_module.prf | 8 ++++---- |
| 8 | + 1 file changed, 4 insertions(+), 4 deletions(-) |
| 9 | + |
| 10 | +diff --git a/qtbase/mkspecs/features/qt_module.prf b/qtbase/mkspecs/features/qt_module.prf |
| 11 | +index 79187cb9932..7f6e9d9e48d 100644 |
1 | 12 | --- a/qtbase/mkspecs/features/qt_module.prf |
2 | 13 | +++ b/qtbase/mkspecs/features/qt_module.prf |
3 | | -@@ -275,12 +275,12 @@ load(qt_targets) |
| 14 | +@@ -268,12 +268,12 @@ load(qt_targets) |
4 | 15 | host_build: \ |
5 | 16 | QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS] |
6 | 17 | else: \ |
|
16 | 27 | QMAKE_PKGCONFIG_CFLAGS = -D$$MODULE_DEFINE -I${includedir}/$$MODULE_INCNAME |
17 | 28 | for(inc, MODULE_AUX_INCLUDES): \ |
18 | 29 | QMAKE_PKGCONFIG_CFLAGS += -I${includedir}/$$section(inc, /, 1, 1) |
19 | | -@@ -308,7 +308,7 @@ load(qt_targets) |
| 30 | +@@ -301,7 +301,7 @@ load(qt_targets) |
20 | 31 | host_build: \ |
21 | 32 | QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS] |
22 | 33 | else: \ |
|
25 | 36 | !isEmpty(lib_replace0.match) { |
26 | 37 | ltlib_replace0.match = $$lib_replace0.match |
27 | 38 | ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/ |
| 39 | +-- |
| 40 | +2.53.0 |
| 41 | + |
0 commit comments