From b5916b969ed0794a5b1bd049387ad0ef762a6662 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 4 Aug 2021 13:55:31 +0200 Subject: Convert to new override syntax 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 --- recipes-qt/qt5/qt5-creator_git.bb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'recipes-qt/qt5/qt5-creator_git.bb') 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 = " \ inherit qmake5 DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native" -DEPENDS_append_toolchain-clang = " clang llvm-common" -DEPENDS_append_libc-musl = " libexecinfo" +DEPENDS:append:toolchain-clang = " clang llvm-common" +DEPENDS:append:libc-musl = " libexecinfo" SRCREV = "8768e39d3c8e74e583eca3897cc6de53a99c3dde" PV = "4.7.1+git${SRCPV}" @@ -28,7 +28,7 @@ SRC_URI = " \ file://0002-botan.pro-pass-QMAKE_AR.patch \ file://0001-botan-Always-define-BOTAN_ARCH_SWITCH-when-cross-bui.patch \ " -SRC_URI_append_libc-musl = " file://0003-Link-with-libexecinfo-on-musl.patch" +SRC_URI:append:libc-musl = " file://0003-Link-with-libexecinfo-on-musl.patch" S = "${WORKDIR}/git" @@ -36,7 +36,7 @@ EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}" EXTRANATIVEPATH += "chrpath-native" -do_configure_append() { +do_configure:append() { # Find native tools sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile if [ -e ${B}/share/qtcreator/translations/Makefile ]; then @@ -50,28 +50,28 @@ do_configure_append() { do_install() { oe_runmake install INSTALL_ROOT=${D}${prefix} } -do_install_append_toolchain-clang () { +do_install:append:toolchain-clang () { # Remove RPATHs embedded in bins chrpath --delete ${D}${libdir}/qtcreator/plugins/libClang* chrpath --delete ${D}${libexecdir}/qtcreator/clang* } -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/qtcreator \ ${datadir}/metainfo \ ${datadir}/icons \ ${libdir}${QT_DIR_NAME}/qtcreator \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${libdir}${QT_DIR_NAME}/qtcreator/*${SOLIBSDEV} \ " -RDEPENDS_${PN} += "perl python" -RCONFLICTS_${PN} = "qt-creator" +RDEPENDS:${PN} += "perl python" +RCONFLICTS:${PN} = "qt-creator" # To give best user experience out of the box.. -RRECOMMENDS_${PN} += " \ +RRECOMMENDS:${PN} += " \ packagegroup-qt5-toolchain-target \ binutils \ ccache \ @@ -81,4 +81,4 @@ RRECOMMENDS_${PN} += " \ " # 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' -INSANE_SKIP_${PN} += "ldflags" +INSANE_SKIP:${PN} += "ldflags" -- cgit v1.2.3-54-g00ecf