diff options
Diffstat (limited to 'recipes-qt/qt5/qt5-creator_git.bb')
-rw-r--r-- | recipes-qt/qt5/qt5-creator_git.bb | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/recipes-qt/qt5/qt5-creator_git.bb b/recipes-qt/qt5/qt5-creator_git.bb index a83dab23..518100ed 100644 --- a/recipes-qt/qt5/qt5-creator_git.bb +++ b/recipes-qt/qt5/qt5-creator_git.bb | |||
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = " \ | |||
15 | inherit qmake5 mime-xdg | 15 | inherit qmake5 mime-xdg |
16 | 16 | ||
17 | DEPENDS += "qtbase qtscript qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native zlib" | 17 | DEPENDS += "qtbase qtscript qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native zlib" |
18 | DEPENDS_append_libc-musl = " libexecinfo" | 18 | DEPENDS:append:libc-musl = " libexecinfo" |
19 | 19 | ||
20 | SRCREV = "94d227cd434d09717de95529e5210ec530451e1c" | 20 | SRCREV = "94d227cd434d09717de95529e5210ec530451e1c" |
21 | PV = "4.15.2+git${SRCPV}" | 21 | PV = "4.15.2+git${SRCPV}" |
@@ -27,7 +27,7 @@ SRC_URI = " \ | |||
27 | file://0002-clangformat-Fix-build-with-LLVM-13.patch \ | 27 | file://0002-clangformat-Fix-build-with-LLVM-13.patch \ |
28 | file://0003-clangformat-Fix-build-with-LLVM-13.patch \ | 28 | file://0003-clangformat-Fix-build-with-LLVM-13.patch \ |
29 | " | 29 | " |
30 | SRC_URI_append_libc-musl = " file://0001-Link-with-libexecinfo-on-musl.patch" | 30 | SRC_URI:append:libc-musl = " file://0001-Link-with-libexecinfo-on-musl.patch" |
31 | 31 | ||
32 | S = "${WORKDIR}/git" | 32 | S = "${WORKDIR}/git" |
33 | 33 | ||
@@ -39,16 +39,16 @@ EXTRA_QMAKEVARS_PRE += " \ | |||
39 | EXTRANATIVEPATH += "chrpath-native" | 39 | EXTRANATIVEPATH += "chrpath-native" |
40 | 40 | ||
41 | PACKAGECONFIG ??= "" | 41 | PACKAGECONFIG ??= "" |
42 | PACKAGECONFIG_append_toolchain-clang = " clang" | 42 | PACKAGECONFIG:append:toolchain-clang = " clang" |
43 | 43 | ||
44 | # Important note: In case clang was added to qttools' PACKAGECONFIG, it has to | 44 | # Important note: In case clang was added to qttools' PACKAGECONFIG, it has to |
45 | # be added here too - otherwise build fails trying to link native clang libraries | 45 | # be added here too - otherwise build fails trying to link native clang libraries |
46 | PACKAGECONFIG[clang] = ",,clang" | 46 | PACKAGECONFIG[clang] = ",,clang" |
47 | 47 | ||
48 | COMPATIBLE_HOST_toolchain-clang_riscv32 = "null" | 48 | COMPATIBLE_HOST:toolchain-clang:riscv32 = "null" |
49 | COMPATIBLE_HOST_toolchain-clang_riscv64 = "null" | 49 | COMPATIBLE_HOST:toolchain-clang:riscv64 = "null" |
50 | 50 | ||
51 | do_configure_append() { | 51 | do_configure:append() { |
52 | # Find native tools | 52 | # Find native tools |
53 | sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile | 53 | sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile |
54 | if [ -e ${B}/share/qtcreator/translations/Makefile ]; then | 54 | if [ -e ${B}/share/qtcreator/translations/Makefile ]; then |
@@ -68,22 +68,22 @@ do_install() { | |||
68 | fi | 68 | fi |
69 | } | 69 | } |
70 | 70 | ||
71 | FILES_${PN} += " \ | 71 | FILES:${PN} += " \ |
72 | ${datadir}/qtcreator \ | 72 | ${datadir}/qtcreator \ |
73 | ${datadir}/metainfo \ | 73 | ${datadir}/metainfo \ |
74 | ${datadir}/icons \ | 74 | ${datadir}/icons \ |
75 | ${libdir}${QT_DIR_NAME}/qtcreator \ | 75 | ${libdir}${QT_DIR_NAME}/qtcreator \ |
76 | " | 76 | " |
77 | 77 | ||
78 | FILES_${PN}-dev += " \ | 78 | FILES:${PN}-dev += " \ |
79 | ${libdir}${QT_DIR_NAME}/qtcreator/*${SOLIBSDEV} \ | 79 | ${libdir}${QT_DIR_NAME}/qtcreator/*${SOLIBSDEV} \ |
80 | " | 80 | " |
81 | 81 | ||
82 | RDEPENDS_${PN} += "perl python3" | 82 | RDEPENDS:${PN} += "perl python3" |
83 | RCONFLICTS_${PN} = "qt-creator" | 83 | RCONFLICTS:${PN} = "qt-creator" |
84 | 84 | ||
85 | # To give best user experience out of the box.. | 85 | # To give best user experience out of the box.. |
86 | RRECOMMENDS_${PN} += " \ | 86 | RRECOMMENDS:${PN} += " \ |
87 | packagegroup-qt5-toolchain-target \ | 87 | packagegroup-qt5-toolchain-target \ |
88 | binutils \ | 88 | binutils \ |
89 | ccache \ | 89 | ccache \ |
@@ -98,7 +98,7 @@ RRECOMMENDS_${PN} += " \ | |||
98 | " | 98 | " |
99 | 99 | ||
100 | # ERROR: qt5-creator-4.5.1-r0 do_package_qa: QA Issue: No GNU_HASH in the elf binary: '/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qt5-creator/4.5.1-r0/packages-split/qt5-creator/usr/lib/qt5/qtcreator/libqbscore.so.1.10.1' | 100 | # ERROR: qt5-creator-4.5.1-r0 do_package_qa: QA Issue: No GNU_HASH in the elf binary: '/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qt5-creator/4.5.1-r0/packages-split/qt5-creator/usr/lib/qt5/qtcreator/libqbscore.so.1.10.1' |
101 | INSANE_SKIP_${PN} += "ldflags" | 101 | INSANE_SKIP:${PN} += "ldflags" |
102 | 102 | ||
103 | inherit features_check | 103 | inherit features_check |
104 | REQUIRED_DISTRO_FEATURES ?= "x11 opengl" | 104 | REQUIRED_DISTRO_FEATURES ?= "x11 opengl" |