summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch47
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch47
-rw-r--r--recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch47
-rw-r--r--recipes-qt/qt5/qtbase.inc1
4 files changed, 142 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
new file mode 100644
index 00000000..107ba30b
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
@@ -0,0 +1,47 @@
1From 27465c65419c1b5bdc8ed50e56428ff5fd64f62b Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de>
3Date: Mon, 22 Jul 2013 21:09:41 +0000
4Subject: [PATCH 24/24] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path
5 to host binaries
6
7Upstream-Status: Inappropiate (configuration)
8
9Signed-off-by: Simon Busch <morphis@gravedo.de>
10---
11 src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++---
12 1 file changed, 3 insertions(+), 3 deletions(-)
13
14diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
15index 4e0fcda..2bbb54c 100644
16--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
17+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
18@@ -6,7 +6,7 @@ if (NOT TARGET Qt5::qmake)
19 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
20 IMPORTED_LOCATION \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\"
21 !!ELSE
22- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\"
23+ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\"
24 !!ENDIF
25 )
26 endif()
27@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc)
28 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
29 IMPORTED_LOCATION \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\"
30 !!ELSE
31- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\"
32+ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\"
33 !!ENDIF
34 )
35 # For CMake automoc feature
36@@ -32,7 +32,7 @@ if (NOT TARGET Qt5::rcc)
37 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
38 IMPORTED_LOCATION \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\"
39 !!ELSE
40- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\"
41+ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\"
42 !!ENDIF
43 )
44 endif()
45--
461.8.3.2
47
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
new file mode 100644
index 00000000..00fa5aea
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
@@ -0,0 +1,47 @@
1From 26ea6bec700ebe345113558c334389cb408780c4 Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de>
3Date: Mon, 22 Jul 2013 21:09:41 +0000
4Subject: [PATCH 24/24] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path
5 to host binaries
6
7Upstream-Status: Inappropiate (configuration)
8
9Signed-off-by: Simon Busch <morphis@gravedo.de>
10---
11 src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++---
12 1 file changed, 3 insertions(+), 3 deletions(-)
13
14diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
15index a804278..a1f8492 100644
16--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
17+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
18@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
19 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
20 set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
21 !!ELSE
22- set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
23+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
24 !!ENDIF
25 _qt5_Core_check_file_exists(${imported_location})
26
27@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::moc)
28 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
29 set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
30 !!ELSE
31- set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
32+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
33 !!ENDIF
34 _qt5_Core_check_file_exists(${imported_location})
35
36@@ -37,7 +37,7 @@ if (NOT TARGET Qt5::rcc)
37 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
38 set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
39 !!ELSE
40- set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
41+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
42 !!ENDIF
43 _qt5_Core_check_file_exists(${imported_location})
44
45--
461.8.3.2
47
diff --git a/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
new file mode 100644
index 00000000..aa51e2f8
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
@@ -0,0 +1,47 @@
1From 03ff55ff67ef7ab929d9b323484da382f6318df2 Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de>
3Date: Mon, 22 Jul 2013 21:09:41 +0000
4Subject: [PATCH 24/24] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path
5 to host binaries
6
7Upstream-Status: Inappropiate (configuration)
8
9Signed-off-by: Simon Busch <morphis@gravedo.de>
10---
11 src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++---
12 1 file changed, 3 insertions(+), 3 deletions(-)
13
14diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
15index e01b448..2f6b8ea 100644
16--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
17+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
18@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
19 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
20 set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
21 !!ELSE
22- set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
23+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
24 !!ENDIF
25 _qt5_Core_check_file_exists(${imported_location})
26
27@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::moc)
28 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
29 set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
30 !!ELSE
31- set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
32+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
33 !!ENDIF
34 _qt5_Core_check_file_exists(${imported_location})
35
36@@ -37,7 +37,7 @@ if (NOT TARGET Qt5::rcc)
37 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
38 set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
39 !!ELSE
40- set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
41+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
42 !!ENDIF
43 _qt5_Core_check_file_exists(${imported_location})
44
45--
461.8.3.2
47
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 5c1b51b6..21386dcb 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -21,6 +21,7 @@ SRC_URI += " \
21 file://0021-configure-make-pulseaudio-a-configurable-option.patch \ 21 file://0021-configure-make-pulseaudio-a-configurable-option.patch \
22 file://0022-configure-make-alsa-a-configurable-option.patch \ 22 file://0022-configure-make-alsa-a-configurable-option.patch \
23 file://0023-configure-make-freetype-a-configurable-option.patch \ 23 file://0023-configure-make-freetype-a-configurable-option.patch \
24 file://0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \
24" 25"
25 26
26DEPENDS += "qtbase-native" 27DEPENDS += "qtbase-native"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-28 02:56:35 +0000