summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2019-01-12 17:58:58 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2019-01-12 17:58:58 +0000
commit82abc2bb38e6db10b469975c1f50be1bc1c078e8 (patch)
tree59da3dc515151c94e3f7165bf603b1d2cc4f14b8
parentf4c8cef8586d28f51f69a78717c10093f8a9f730 (diff)
downloadmeta-qt5-82abc2bb38e6db10b469975c1f50be1bc1c078e8.tar.gz
qtbase: fix incomplete recipe changes from previous commit
* the patches were renamed, but I forgot to amend the SRC_URI modifications Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb6
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb6
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
3 files changed, 7 insertions, 7 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index e3e063a6..1a0e38eb 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -23,7 +23,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
23 23
24# common for qtbase-native, qtbase-nativesdk and qtbase 24# common for qtbase-native, qtbase-nativesdk and qtbase
25# Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared 25# Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared
26# 5.12.meta-qt5-shared.4 26# 5.12.meta-qt5-shared.5
27SRC_URI += "\ 27SRC_URI += "\
28 file://0001-Add-linux-oe-g-platform.patch \ 28 file://0001-Add-linux-oe-g-platform.patch \
29 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ 29 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -44,14 +44,14 @@ SRC_URI += "\
44 file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ 44 file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
45 file://0018-Fix-compile-issue-with-gcc-9.patch \ 45 file://0018-Fix-compile-issue-with-gcc-9.patch \
46 file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ 46 file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \
47 file://0022-Fix-qbswap-calls-for-Big-Endian-targets.patch \ 47 file://0020-Fix-qbswap-calls-for-Big-Endian-targets.patch \
48" 48"
49 49
50# common for qtbase-native and nativesdk-qtbase 50# common for qtbase-native and nativesdk-qtbase
51# Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native 51# Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native
52# 5.12.meta-qt5-native.5 52# 5.12.meta-qt5-native.5
53SRC_URI += " \ 53SRC_URI += " \
54 file://0020-Always-build-uic-and-qvkgen.patch \ 54 file://0021-Always-build-uic-and-qvkgen.patch \
55" 55"
56 56
57# CMake's toolchain configuration of nativesdk-qtbase 57# CMake's toolchain configuration of nativesdk-qtbase
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 3ab6d5e9..e636167e 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -39,19 +39,19 @@ SRC_URI += "\
39 file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ 39 file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
40 file://0018-Fix-compile-issue-with-gcc-9.patch \ 40 file://0018-Fix-compile-issue-with-gcc-9.patch \
41 file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ 41 file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \
42 file://0022-Fix-qbswap-calls-for-Big-Endian-targets.patch \ 42 file://0020-Fix-qbswap-calls-for-Big-Endian-targets.patch \
43" 43"
44 44
45# common for qtbase-native and nativesdk-qtbase 45# common for qtbase-native and nativesdk-qtbase
46# Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native 46# Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native
47# 5.12.meta-qt5-native.5 47# 5.12.meta-qt5-native.5
48SRC_URI += " \ 48SRC_URI += " \
49 file://0020-Always-build-uic-and-qvkgen.patch \ 49 file://0021-Always-build-uic-and-qvkgen.patch \
50" 50"
51 51
52# only for qtbase-native 52# only for qtbase-native
53SRC_URI += " \ 53SRC_URI += " \
54 file://0021-Bootstrap-without-linkat-feature.patch \ 54 file://0022-Bootstrap-without-linkat-feature.patch \
55" 55"
56 56
57CLEANBROKEN = "1" 57CLEANBROKEN = "1"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 3d385dd6..d89ab2b7 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -35,7 +35,7 @@ SRC_URI += "\
35 file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ 35 file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
36 file://0018-Fix-compile-issue-with-gcc-9.patch \ 36 file://0018-Fix-compile-issue-with-gcc-9.patch \
37 file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ 37 file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \
38 file://0022-Fix-qbswap-calls-for-Big-Endian-targets.patch \ 38 file://0020-Fix-qbswap-calls-for-Big-Endian-targets.patch \
39" 39"
40 40
41 41