diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-09-15 22:18:56 +0000 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-09-15 22:27:05 +0000 |
| commit | b6cf0969829ce16cc936ec0b8d1e2ef6b30ce592 (patch) | |
| tree | e5824ccd48089beac26e2c559f6961613775c0cc /recipes-qt | |
| parent | 6d3eb8fc0c9f9ec42217c5d8a18eb3171def99ae (diff) | |
Revert "Fix rpm metadata issue between cmake and nativesdk-qtbase"
This reverts commit ecc327fed8f801f0d579bdd4e1d9ab9023a8eb49.
New fix upcoming in meta-agl/meta-agl-distro .
Change-Id: Iba253672933dea2ce7f2e20fc5be5e6efc7946cd
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'recipes-qt')
| -rw-r--r-- | recipes-qt/qt5/qtbase_%.bbappend | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend index 2deed9a3..af2722d0 100644 --- a/recipes-qt/qt5/qtbase_%.bbappend +++ b/recipes-qt/qt5/qtbase_%.bbappend @@ -16,7 +16,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 |