diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch index c44611d5..de8e1a4d 100644 --- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 0ac23b38794bd4580428e11b2cf1c88eb7f410f3 Mon Sep 17 00:00:00 2001 | 1 | From 90f3f8f59dd23f67e14c9988c2f4449a31762752 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 | 3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 |
4 | Subject: [PATCH 03/10] Add -external-hostbindir option | 4 | Subject: [PATCH 03/10] Add -external-hostbindir option |
@@ -37,10 +37,10 @@ Conflicts: | |||
37 | 7 files changed, 37 insertions(+), 12 deletions(-) | 37 | 7 files changed, 37 insertions(+), 12 deletions(-) |
38 | 38 | ||
39 | diff --git a/configure b/configure | 39 | diff --git a/configure b/configure |
40 | index dfbb111..548dd0d 100755 | 40 | index e1929e7..a757ce5 100755 |
41 | --- a/configure | 41 | --- a/configure |
42 | +++ b/configure | 42 | +++ b/configure |
43 | @@ -806,6 +806,7 @@ QT_HOST_BINS= | 43 | @@ -809,6 +809,7 @@ QT_HOST_BINS= |
44 | QT_HOST_LIBS= | 44 | QT_HOST_LIBS= |
45 | QT_HOST_DATA= | 45 | QT_HOST_DATA= |
46 | QT_EXT_PREFIX= | 46 | QT_EXT_PREFIX= |
@@ -48,7 +48,7 @@ index dfbb111..548dd0d 100755 | |||
48 | 48 | ||
49 | #flags for SQL drivers | 49 | #flags for SQL drivers |
50 | QT_CFLAGS_PSQL= | 50 | QT_CFLAGS_PSQL= |
51 | @@ -925,6 +926,7 @@ while [ "$#" -gt 0 ]; do | 51 | @@ -928,6 +929,7 @@ while [ "$#" -gt 0 ]; do |
52 | -testsdir| \ | 52 | -testsdir| \ |
53 | -hostdatadir| \ | 53 | -hostdatadir| \ |
54 | -hostbindir| \ | 54 | -hostbindir| \ |
@@ -56,7 +56,7 @@ index dfbb111..548dd0d 100755 | |||
56 | -hostlibdir| \ | 56 | -hostlibdir| \ |
57 | -extprefix| \ | 57 | -extprefix| \ |
58 | -sysroot| \ | 58 | -sysroot| \ |
59 | @@ -1154,6 +1156,9 @@ while [ "$#" -gt 0 ]; do | 59 | @@ -1157,6 +1159,9 @@ while [ "$#" -gt 0 ]; do |
60 | extprefix) | 60 | extprefix) |
61 | QT_EXT_PREFIX="$VAL" | 61 | QT_EXT_PREFIX="$VAL" |
62 | ;; | 62 | ;; |
@@ -66,7 +66,7 @@ index dfbb111..548dd0d 100755 | |||
66 | pkg-config) | 66 | pkg-config) |
67 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | 67 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then |
68 | CFG_PKGCONFIG="$VAL" | 68 | CFG_PKGCONFIG="$VAL" |
69 | @@ -2380,6 +2385,10 @@ Installation options: | 69 | @@ -2383,6 +2388,10 @@ Installation options: |
70 | -hostdatadir <dir> . Data used by qmake will be installed to <dir> | 70 | -hostdatadir <dir> . Data used by qmake will be installed to <dir> |
71 | (default HOSTPREFIX) | 71 | (default HOSTPREFIX) |
72 | 72 | ||
@@ -77,7 +77,7 @@ index dfbb111..548dd0d 100755 | |||
77 | Configure options: | 77 | Configure options: |
78 | 78 | ||
79 | The defaults (*) are usually acceptable. A plus (+) denotes a default value | 79 | The defaults (*) are usually acceptable. A plus (+) denotes a default value |
80 | @@ -3097,6 +3106,11 @@ fi | 80 | @@ -3110,6 +3119,11 @@ fi |
81 | # command line and environment validation | 81 | # command line and environment validation |
82 | #------------------------------------------------------------------------------- | 82 | #------------------------------------------------------------------------------- |
83 | 83 | ||
@@ -225,5 +225,5 @@ index 99d87e2..5621dc0 100644 | |||
225 | _qt5_Widgets_check_file_exists(${imported_location}) | 225 | _qt5_Widgets_check_file_exists(${imported_location}) |
226 | 226 | ||
227 | -- | 227 | -- |
228 | 2.5.0 | 228 | 2.5.3 |
229 | 229 | ||