X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-qt%2Fqt5%2Fqtbase_%25.bbappend;h=203b3264b8f90f1ee0bc330284e31f616ec0619f;hb=f46c2da5dda9b860ccefdffc8ceb83d4b4e63f77;hp=2deed9a3a4a5d93cd9fdb0d45531e7c29ad8abb1;hpb=ecc327fed8f801f0d579bdd4e1d9ab9023a8eb49;p=AGL%2Fmeta-agl-demo.git diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend index 2deed9a3a..203b3264b 100644 --- a/recipes-qt/qt5/qtbase_%.bbappend +++ b/recipes-qt/qt5/qtbase_%.bbappend @@ -1,7 +1,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" DEPENDS_append_koelsch = " libegl" -DEPENDS_append_porter = " libegl" +#DEPENDS_append_porter = " libegl" +DEPENDS_append_porter = " ${@base_conditional('PREFERRED_PROVIDER_virtual/egl', 'mesa', 'mesa', 'libegl', d)}" PACKAGECONFIG_WAYLAND = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" PACKAGECONFIG_GL = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)}" @@ -16,7 +17,3 @@ PACKAGECONFIG[wayland]="-qpa wayland-egl -no-qpa-platform-guard" # Temporarily fix bug due to binutils 2.28 QT_CONFIG_FLAGS_append = " -no-use-gold-linker" - -# hotfix for RPM folder clash -# file /opt/poky-agl/4.90.0+snapshot/sysroots/x86_64-aglsdk-linux/environment-setup.d conflicts between attempted installs of nativesdk-cmake-3.7.2-r0.x86_64_nativesdk and nativesdk-qtbase-tools-5.8.0+git0+49dc9aa409-r0.x86_64_nativesdk -DIRFILES_class-nativesdk = "" \ No newline at end of file