summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qt5-creator_git.bb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2021-08-04 13:55:31 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2021-08-04 13:55:31 +0200
commitb5916b969ed0794a5b1bd049387ad0ef762a6662 (patch)
tree9e46b88a2a0e4c2de19213f3eac7b73621ef7946 /recipes-qt/qt5/qt5-creator_git.bb
parentb3995cd83ed67897ef1db010052eb807c19d6483 (diff)
downloadmeta-qt5-b5916b969ed0794a5b1bd049387ad0ef762a6662.tar.gz
Convert to new override syntaxupstream/jansa/warrior-overrides
This is the result of automated script (0.9.1) conversion: oe-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qt5-creator_git.bb')
-rw-r--r--recipes-qt/qt5/qt5-creator_git.bb22
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 = " \
15inherit qmake5 15inherit qmake5
16 16
17DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native" 17DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native"
18DEPENDS_append_toolchain-clang = " clang llvm-common" 18DEPENDS:append:toolchain-clang = " clang llvm-common"
19DEPENDS_append_libc-musl = " libexecinfo" 19DEPENDS:append:libc-musl = " libexecinfo"
20 20
21SRCREV = "8768e39d3c8e74e583eca3897cc6de53a99c3dde" 21SRCREV = "8768e39d3c8e74e583eca3897cc6de53a99c3dde"
22PV = "4.7.1+git${SRCPV}" 22PV = "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"
31SRC_URI_append_libc-musl = " file://0003-Link-with-libexecinfo-on-musl.patch" 31SRC_URI:append:libc-musl = " file://0003-Link-with-libexecinfo-on-musl.patch"
32 32
33S = "${WORKDIR}/git" 33S = "${WORKDIR}/git"
34 34
@@ -36,7 +36,7 @@ EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}"
36 36
37EXTRANATIVEPATH += "chrpath-native" 37EXTRANATIVEPATH += "chrpath-native"
38 38
39do_configure_append() { 39do_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() {
50do_install() { 50do_install() {
51 oe_runmake install INSTALL_ROOT=${D}${prefix} 51 oe_runmake install INSTALL_ROOT=${D}${prefix}
52} 52}
53do_install_append_toolchain-clang () { 53do_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
59FILES_${PN} += " \ 59FILES:${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
66FILES_${PN}-dev += " \ 66FILES:${PN}-dev += " \
67 ${libdir}${QT_DIR_NAME}/qtcreator/*${SOLIBSDEV} \ 67 ${libdir}${QT_DIR_NAME}/qtcreator/*${SOLIBSDEV} \
68" 68"
69 69
70RDEPENDS_${PN} += "perl python" 70RDEPENDS:${PN} += "perl python"
71RCONFLICTS_${PN} = "qt-creator" 71RCONFLICTS:${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..
74RRECOMMENDS_${PN} += " \ 74RRECOMMENDS:${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'
84INSANE_SKIP_${PN} += "ldflags" 84INSANE_SKIP:${PN} += "ldflags"