Skip to content
Snippets Groups Projects
Commit d8f60fdd authored by Samuli Piippo's avatar Samuli Piippo
Browse files

qtquickcompiler: include dependency libs for mingw


Windows version of qtquickcompiler requires additional mingw libraries,
that are not built in yocto. Include those from prebuilt package used
also by Qt desktop packages in Windows.

Task-number: QTBUG-58256
Change-Id: Id27d2267c43e562c089614498e33bd454e649ebc
Reviewed-by: default avatarMikko Gronoff <mikko.gronoff@qt.io>
parent d5a2105b
No related branches found
No related tags found
No related merge requests found
...@@ -33,11 +33,12 @@ LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" ...@@ -33,11 +33,12 @@ LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
inherit allarch qmake5_paths inherit allarch qmake5_paths
DEPENDS = "qtbase" SRC_URI = "http://download.qt.io/development_releases/prebuilt/mingw_32/i686-4.9.2-release-posix-dwarf-rt_v3-rev1-runtime.7z"
S = "${WORKDIR}" SRC_URI[md5sum] = "a7d673c4ad8bcef9e464ea5386492cb3"
SRC_URI[sha256sum] = "f7e58b0fb1f5aa4c23eefdc60abb88cb642eaa272fb741dca23068c70ca86542"
QT_VERSION = "5.6" S = "${WORKDIR}"
NATIVESDK_BINARY = "qtquickcompiler" NATIVESDK_BINARY = "qtquickcompiler"
NATIVESDK_BINARY_mingw32 = "qtquickcompiler.exe" NATIVESDK_BINARY_mingw32 = "qtquickcompiler.exe"
...@@ -57,6 +58,13 @@ do_install() { ...@@ -57,6 +58,13 @@ do_install() {
fi fi
} }
do_install_append_mingw32() {
if [ "${PN}" = "nativesdk-qtquickcompiler-sdk" ]; then
install -m 0644 ${WORKDIR}/libgcc_s_dw2-1.dll ${D}${OE_QMAKE_PATH_BINS}
install -m 0644 ${WORKDIR}/libwinpthread-1.dll ${D}${OE_QMAKE_PATH_BINS}
fi
}
INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_STRIP = "1"
ALLOW_EMPTY_${PN} = "1" ALLOW_EMPTY_${PN} = "1"
PACKAGES =+ "${PN}-tools" PACKAGES =+ "${PN}-tools"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment