diff options
Diffstat (limited to 'recipes-qt/qt5/qt5-creator_git.bb')
-rw-r--r-- | recipes-qt/qt5/qt5-creator_git.bb | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/recipes-qt/qt5/qt5-creator_git.bb b/recipes-qt/qt5/qt5-creator_git.bb index 6a8887ed..55a49cea 100644 --- a/recipes-qt/qt5/qt5-creator_git.bb +++ b/recipes-qt/qt5/qt5-creator_git.bb | |||
@@ -15,8 +15,8 @@ LIC_FILES_CHKSUM = " \ | |||
15 | inherit qmake5 | 15 | inherit qmake5 |
16 | 16 | ||
17 | DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native" | 17 | DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native" |
18 | DEPENDS_append_toolchain-clang = " clang llvm-common" | 18 | DEPENDS:append:toolchain-clang = " clang llvm-common" |
19 | DEPENDS_append_libc-musl = " libexecinfo" | 19 | DEPENDS:append:libc-musl = " libexecinfo" |
20 | 20 | ||
21 | SRCREV = "8768e39d3c8e74e583eca3897cc6de53a99c3dde" | 21 | SRCREV = "8768e39d3c8e74e583eca3897cc6de53a99c3dde" |
22 | PV = "4.7.1+git${SRCPV}" | 22 | PV = "4.7.1+git${SRCPV}" |
@@ -28,7 +28,7 @@ SRC_URI = " \ | |||
28 | file://0002-botan.pro-pass-QMAKE_AR.patch \ | 28 | file://0002-botan.pro-pass-QMAKE_AR.patch \ |
29 | file://0001-botan-Always-define-BOTAN_ARCH_SWITCH-when-cross-bui.patch \ | 29 | file://0001-botan-Always-define-BOTAN_ARCH_SWITCH-when-cross-bui.patch \ |
30 | " | 30 | " |
31 | SRC_URI_append_libc-musl = " file://0003-Link-with-libexecinfo-on-musl.patch" | 31 | SRC_URI:append:libc-musl = " file://0003-Link-with-libexecinfo-on-musl.patch" |
32 | 32 | ||
33 | S = "${WORKDIR}/git" | 33 | S = "${WORKDIR}/git" |
34 | 34 | ||
@@ -36,7 +36,7 @@ EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}" | |||
36 | 36 | ||
37 | EXTRANATIVEPATH += "chrpath-native" | 37 | EXTRANATIVEPATH += "chrpath-native" |
38 | 38 | ||
39 | do_configure_append() { | 39 | do_configure:append() { |
40 | # Find native tools | 40 | # Find native tools |
41 | sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile | 41 | sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile |
42 | if [ -e ${B}/share/qtcreator/translations/Makefile ]; then | 42 | if [ -e ${B}/share/qtcreator/translations/Makefile ]; then |
@@ -50,28 +50,28 @@ do_configure_append() { | |||
50 | do_install() { | 50 | do_install() { |
51 | oe_runmake install INSTALL_ROOT=${D}${prefix} | 51 | oe_runmake install INSTALL_ROOT=${D}${prefix} |
52 | } | 52 | } |
53 | do_install_append_toolchain-clang () { | 53 | do_install:append:toolchain-clang () { |
54 | # Remove RPATHs embedded in bins | 54 | # Remove RPATHs embedded in bins |
55 | chrpath --delete ${D}${libdir}/qtcreator/plugins/libClang* | 55 | chrpath --delete ${D}${libdir}/qtcreator/plugins/libClang* |
56 | chrpath --delete ${D}${libexecdir}/qtcreator/clang* | 56 | chrpath --delete ${D}${libexecdir}/qtcreator/clang* |
57 | } | 57 | } |
58 | 58 | ||
59 | FILES_${PN} += " \ | 59 | FILES:${PN} += " \ |
60 | ${datadir}/qtcreator \ | 60 | ${datadir}/qtcreator \ |
61 | ${datadir}/metainfo \ | 61 | ${datadir}/metainfo \ |
62 | ${datadir}/icons \ | 62 | ${datadir}/icons \ |
63 | ${libdir}${QT_DIR_NAME}/qtcreator \ | 63 | ${libdir}${QT_DIR_NAME}/qtcreator \ |
64 | " | 64 | " |
65 | 65 | ||
66 | FILES_${PN}-dev += " \ | 66 | FILES:${PN}-dev += " \ |
67 | ${libdir}${QT_DIR_NAME}/qtcreator/*${SOLIBSDEV} \ | 67 | ${libdir}${QT_DIR_NAME}/qtcreator/*${SOLIBSDEV} \ |
68 | " | 68 | " |
69 | 69 | ||
70 | RDEPENDS_${PN} += "perl python" | 70 | RDEPENDS:${PN} += "perl python" |
71 | RCONFLICTS_${PN} = "qt-creator" | 71 | RCONFLICTS:${PN} = "qt-creator" |
72 | 72 | ||
73 | # To give best user experience out of the box.. | 73 | # To give best user experience out of the box.. |
74 | RRECOMMENDS_${PN} += " \ | 74 | RRECOMMENDS:${PN} += " \ |
75 | packagegroup-qt5-toolchain-target \ | 75 | packagegroup-qt5-toolchain-target \ |
76 | binutils \ | 76 | binutils \ |
77 | ccache \ | 77 | ccache \ |
@@ -81,4 +81,4 @@ RRECOMMENDS_${PN} += " \ | |||
81 | " | 81 | " |
82 | 82 | ||
83 | # 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' | 83 | # 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' |
84 | INSANE_SKIP_${PN} += "ldflags" | 84 | INSANE_SKIP:${PN} += "ldflags" |