diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch index 9fa0a333..5bb73e75 100644 --- a/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch +++ b/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 2b55cf1075167ce6b7e4cff1ea89dc2c27265f23 Mon Sep 17 00:00:00 2001 | 1 | From 5b4ae15a19a9135d3dc8a35aa2d109ba8d29868a 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 10/10] Add -external-hostbindir option for native(sdk) | 4 | Subject: [PATCH] Add -external-hostbindir option for native(sdk) |
5 | 5 | ||
6 | * when cross-compiling it's sometimes useful to use existing tools from machine | 6 | * when cross-compiling it's sometimes useful to use existing tools from machine |
7 | (or in OpenEmbedded built with separate native recipe) when building for target | 7 | (or in OpenEmbedded built with separate native recipe) when building for target |
@@ -37,7 +37,7 @@ Conflicts: | |||
37 | 5 files changed, 16 insertions(+), 1 deletion(-) | 37 | 5 files changed, 16 insertions(+), 1 deletion(-) |
38 | 38 | ||
39 | diff --git a/configure b/configure | 39 | diff --git a/configure b/configure |
40 | index c696e7e..310eb1d 100755 | 40 | index 2e99d39..a0641d2 100755 |
41 | --- a/configure | 41 | --- a/configure |
42 | +++ b/configure | 42 | +++ b/configure |
43 | @@ -3922,6 +3922,7 @@ fi | 43 | @@ -3922,6 +3922,7 @@ fi |
@@ -94,10 +94,10 @@ index 1ad7637..5a8b127 100644 | |||
94 | HostSpecPath, | 94 | HostSpecPath, |
95 | HostPrefixPath, | 95 | HostPrefixPath, |
96 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp | 96 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp |
97 | index 555ccbf..d9a5b08 100644 | 97 | index 6f1e2b7..ae03143 100644 |
98 | --- a/tools/configure/configureapp.cpp | 98 | --- a/tools/configure/configureapp.cpp |
99 | +++ b/tools/configure/configureapp.cpp | 99 | +++ b/tools/configure/configureapp.cpp |
100 | @@ -1248,6 +1248,13 @@ void Configure::parseCmdLine() | 100 | @@ -1256,6 +1256,13 @@ void Configure::parseCmdLine() |
101 | dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); | 101 | dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); |
102 | } | 102 | } |
103 | 103 | ||
@@ -111,7 +111,7 @@ index 555ccbf..d9a5b08 100644 | |||
111 | else if (configCmdLine.at(i) == "-make-tool") { | 111 | else if (configCmdLine.at(i) == "-make-tool") { |
112 | ++i; | 112 | ++i; |
113 | if (i == argCount) | 113 | if (i == argCount) |
114 | @@ -4214,6 +4221,9 @@ void Configure::generateQConfigCpp() | 114 | @@ -4232,6 +4239,9 @@ void Configure::generateQConfigCpp() |
115 | 115 | ||
116 | if (dictionary["QT_REL_HOST_DATA"].isEmpty()) | 116 | if (dictionary["QT_REL_HOST_DATA"].isEmpty()) |
117 | dictionary["QT_REL_HOST_DATA"] = haveHpx ? "." : dictionary["QT_REL_INSTALL_ARCHDATA"]; | 117 | dictionary["QT_REL_HOST_DATA"] = haveHpx ? "." : dictionary["QT_REL_INSTALL_ARCHDATA"]; |
@@ -121,7 +121,7 @@ index 555ccbf..d9a5b08 100644 | |||
121 | 121 | ||
122 | confStringOff = 0; | 122 | confStringOff = 0; |
123 | addConfStr(0, dictionary["QT_REL_INSTALL_DOCS"]); | 123 | addConfStr(0, dictionary["QT_REL_INSTALL_DOCS"]); |
124 | @@ -4233,6 +4243,7 @@ void Configure::generateQConfigCpp() | 124 | @@ -4251,6 +4261,7 @@ void Configure::generateQConfigCpp() |
125 | addConfStr(1, dictionary["QT_REL_HOST_BINS"]); | 125 | addConfStr(1, dictionary["QT_REL_HOST_BINS"]); |
126 | addConfStr(1, dictionary["QT_REL_HOST_LIBS"]); | 126 | addConfStr(1, dictionary["QT_REL_HOST_LIBS"]); |
127 | addConfStr(1, dictionary["QT_REL_HOST_DATA"]); | 127 | addConfStr(1, dictionary["QT_REL_HOST_DATA"]); |
@@ -129,6 +129,3 @@ index 555ccbf..d9a5b08 100644 | |||
129 | addConfStr(1, targSpec); | 129 | addConfStr(1, targSpec); |
130 | addConfStr(1, hostSpec); | 130 | addConfStr(1, hostSpec); |
131 | 131 | ||
132 | -- | ||
133 | 2.7.1 | ||
134 | |||