diff options
-rw-r--r-- | recipes-qt/qt5/qtwayland_git.bb | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index cfcfad8e..8a6f38f6 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -44,32 +44,3 @@ BBCLASSEXTEND =+ "native nativesdk" | |||
44 | # The same issue as in qtbase: | 44 | # The same issue as in qtbase: |
45 | # http://errors.yoctoproject.org/Errors/Details/152641/ | 45 | # http://errors.yoctoproject.org/Errors/Details/152641/ |
46 | LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 46 | LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
47 | |||
48 | # Since version 5.11.2 some private headers are not installed. Work around | ||
49 | # until fixed upstream. See https://bugreports.qt.io/browse/QTBUG-71340 for | ||
50 | # further details | ||
51 | QTWAYLAND_INSTALL_PRIVATE_HEADERS_MANUALLY ?= "1" | ||
52 | # First 6 characters before first + (e.g. 5.11.3-+git) or - (e.g. 5.11.3-2) | ||
53 | SHRT_VER ?= "${@d.getVar('PV').split('+')[0].split('-')[0]}" | ||
54 | do_install_append() { | ||
55 | if [ -d "${B}/src/client" -a "${QTWAYLAND_INSTALL_PRIVATE_HEADERS_MANUALLY}" = "1" -a -d "${D}${includedir}/QtWaylandClient/${SHRT_VER}/QtWaylandClient/private/" ]; then | ||
56 | for header in `find ${B}/src/client -name '*wayland-*.h'`; do | ||
57 | header_base=`basename $header` | ||
58 | dest="${D}${includedir}/QtWaylandClient/${SHRT_VER}/QtWaylandClient/private/$header_base" | ||
59 | if [ ! -e "$dest" ]; then | ||
60 | echo "Manual install: $header_base to $dest" | ||
61 | install -m 644 "$header" "$dest" | ||
62 | fi | ||
63 | done | ||
64 | fi | ||
65 | if [ -d "${B}/src/compositor" -a "${QTWAYLAND_INSTALL_PRIVATE_HEADERS_MANUALLY}" = "1" -a -d "${D}${includedir}/QtCompositor/${SHRT_VER}/QtCompositor/private/" ]; then | ||
66 | for header in `find ${B}/src/compositor -name '*wayland-*.h'`; do | ||
67 | header_base=`basename $header` | ||
68 | dest="${D}${includedir}/QtCompositor/${SHRT_VER}/QtCompositor/private/$header_base" | ||
69 | if [ ! -e "$dest" ]; then | ||
70 | echo "Manual install: $header_base to $dest" | ||
71 | install -m 644 "$header" "$dest" | ||
72 | fi | ||
73 | done | ||
74 | fi | ||
75 | } | ||