summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch20
1 files changed, 10 insertions, 10 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
index 2957c4fd..4451751d 100644
--- a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
@@ -1,4 +1,4 @@
1From 4efa6ef7025ebd03379d76a419c118189e8e9d4e Mon Sep 17 00:00:00 2001 1From 457efc32bb79060a0a58a82ff8a35d67655ef6d6 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 6 Apr 2013 13:15:07 +0200 3Date: Sat, 6 Apr 2013 13:15:07 +0200
4Subject: [PATCH 03/12] Add -external-hostbindir option 4Subject: [PATCH 03/12] Add -external-hostbindir option
@@ -34,10 +34,10 @@ Signed-off-by: Jonathan Liu <net147@gmail.com>
34 7 files changed, 38 insertions(+), 12 deletions(-) 34 7 files changed, 38 insertions(+), 12 deletions(-)
35 35
36diff --git a/configure b/configure 36diff --git a/configure b/configure
37index 12fe2f0..7ac81d8 100755 37index 0a00d6d..ad5f4cd 100755
38--- a/configure 38--- a/configure
39+++ b/configure 39+++ b/configure
40@@ -769,6 +769,7 @@ QT_HOST_BINS= 40@@ -770,6 +770,7 @@ QT_HOST_BINS=
41 QT_HOST_LIBS= 41 QT_HOST_LIBS=
42 QT_HOST_DATA= 42 QT_HOST_DATA=
43 QT_EXT_PREFIX= 43 QT_EXT_PREFIX=
@@ -45,7 +45,7 @@ index 12fe2f0..7ac81d8 100755
45 45
46 #flags for SQL drivers 46 #flags for SQL drivers
47 QT_CFLAGS_PSQL= 47 QT_CFLAGS_PSQL=
48@@ -888,6 +889,7 @@ while [ "$#" -gt 0 ]; do 48@@ -889,6 +890,7 @@ while [ "$#" -gt 0 ]; do
49 -testsdir| \ 49 -testsdir| \
50 -hostdatadir| \ 50 -hostdatadir| \
51 -hostbindir| \ 51 -hostbindir| \
@@ -53,7 +53,7 @@ index 12fe2f0..7ac81d8 100755
53 -hostlibdir| \ 53 -hostlibdir| \
54 -extprefix| \ 54 -extprefix| \
55 -sysroot| \ 55 -sysroot| \
56@@ -1102,6 +1104,9 @@ while [ "$#" -gt 0 ]; do 56@@ -1107,6 +1109,9 @@ while [ "$#" -gt 0 ]; do
57 extprefix) 57 extprefix)
58 QT_EXT_PREFIX="$VAL" 58 QT_EXT_PREFIX="$VAL"
59 ;; 59 ;;
@@ -63,7 +63,7 @@ index 12fe2f0..7ac81d8 100755
63 pkg-config) 63 pkg-config)
64 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then 64 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
65 CFG_PKGCONFIG="$VAL" 65 CFG_PKGCONFIG="$VAL"
66@@ -2265,6 +2270,10 @@ Installation options: 66@@ -2270,6 +2275,10 @@ Installation options:
67 -hostdatadir <dir> . Data used by qmake will be installed to <dir> 67 -hostdatadir <dir> . Data used by qmake will be installed to <dir>
68 (default HOSTPREFIX) 68 (default HOSTPREFIX)
69 69
@@ -74,7 +74,7 @@ index 12fe2f0..7ac81d8 100755
74 Configure options: 74 Configure options:
75 75
76 The defaults (*) are usually acceptable. A plus (+) denotes a default value 76 The defaults (*) are usually acceptable. A plus (+) denotes a default value
77@@ -2944,6 +2953,11 @@ fi 77@@ -2949,6 +2958,11 @@ fi
78 # command line and environment validation 78 # command line and environment validation
79 #------------------------------------------------------------------------------- 79 #-------------------------------------------------------------------------------
80 80
@@ -86,7 +86,7 @@ index 12fe2f0..7ac81d8 100755
86 # update QT_CONFIG to show our current predefined configuration 86 # update QT_CONFIG to show our current predefined configuration
87 CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h 87 CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
88 case "$CFG_QCONFIG" in 88 case "$CFG_QCONFIG" in
89@@ -3644,6 +3658,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { 89@@ -3649,6 +3663,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = {
90 "qt_hbinpath=$QT_HOST_BINS", 90 "qt_hbinpath=$QT_HOST_BINS",
91 "qt_hlibpath=$QT_HOST_LIBS", 91 "qt_hlibpath=$QT_HOST_LIBS",
92 "qt_hdatpath=$QT_HOST_DATA", 92 "qt_hdatpath=$QT_HOST_DATA",
@@ -163,7 +163,7 @@ index 6d0de44..ddf7478 100644
163 163
164 # If we are doing a prefix build, create a "module" pri which enables 164 # If we are doing a prefix build, create a "module" pri which enables
165diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in 165diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
166index 4387bed..6e1aa7a 100644 166index 7213a84..a977417 100644
167--- a/src/corelib/Qt5CoreConfigExtras.cmake.in 167--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
168+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in 168+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
169@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) 169@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
@@ -229,5 +229,5 @@ index 99d87e2..5621dc0 100644
229 _qt5_Widgets_check_file_exists(${imported_location}) 229 _qt5_Widgets_check_file_exists(${imported_location})
230 230
231-- 231--
2322.3.0 2322.3.1
233 233