@@ -17,8 +17,12 @@ require qmake5-${PV}.inc
#TBD: Bugs are seen with more more than 1 parallel maker
PARALLEL_MAKE = ""
-SRC_URI:>HOST_CPU_i686 = "\
- file://sdk-x86-64-build-fix.patch \
+LINUX_SDK_BUILD_PATCH_TMP=""
+LINUX_SDK_BUILD_PATCH_TMP:sdk = "${LINUX_SDK_BUILD_PATCH}"
+LINUX_SDK_BUILD_PATCH = ""
+LINUX_SDK_BUILD_PATCH:HOST_CPU_i686 = " file://sdk-x86-64-build-fix.patch"
+SRC_URI += " \
+ ${LINUX_SDK_BUILD_PATCH_TMP} \
"
QT_CONF_PATH = "${B}/qt.conf"
@@ -78,10 +82,13 @@ export OE_QMAKE_AR
export OE_QMAKE_STRIP
+CONFIGURE_NATIVE_UTILS_TMP = ""
+CONFIGURE_NATIVE_UTILS_TMP:sdk = "${CONFIGURE_NATIVE_UTILS}"
+
CONFIGURE_NATIVE_UTILS = ""
CONFIGURE_NATIVE_UTILS:HOST_CPU_i686 = "do_configure_linux"
CONFIGURE_NATIVE_UTILS:HOST_LIBC_mingw = "do_configure_mingw"
-do_configure[prefuncs] += "${CONFIGURE_NATIVE_UTILS}"
+do_configure[prefuncs] += "${CONFIGURE_NATIVE_UTILS_TMP}"
do_configure_linux () {
#Use native tools instead of using the wrong sdk tools
ln -sf ${STAGE_DIR}/native/bin/qmake ${S}/bin/qmake
@@ -107,18 +114,14 @@ do_configure_preqt() {
bin/qmake ${USE_MINGW_SPEC} ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}"
}
+
+CONFIGURE_BUILD_SDK_UTILS_TMP = ""
+CONFIGURE_BUILD_SDK_UTILS_TMP:sdk = "${CONFIGURE_BUILD_SDK_UTILS}"
CONFIGURE_BUILD_SDK_UTILS = ""
-CONFIGURE_BUILD_SDK_UTILS:HOST_CPU_i686 = "do_configure_linux2"
-CONFIGURE_BUILD_SDK_UTILS:HOST_LIBC_mingw = "do_configure_mingw2"
-do_configure[postfuncs] += "${CONFIGURE_BUILD_SDK_UTILS}"
-do_configure_linux2 () {
- #Set the build target to something else, so it does not overwrite
- #the native tools
- echo "TARGET = \"realmoc\"" >> ${S}/src/tools/moc/moc.pro
- echo "TARGET = \"realrcc\"" >> ${S}/src/tools/rcc/rcc.pro
- echo "TARGET = \"realuic\"" >> ${S}/src/tools/uic/uic.pro
-}
-do_configure_mingw2 () {
+CONFIGURE_BUILD_SDK_UTILS:HOST_CPU_i686 = "do_configure_sdk_postfunc"
+CONFIGURE_BUILD_SDK_UTILS:HOST_LIBC_mingw = "do_configure_sdk_postfunc"
+do_configure[postfuncs] += "${CONFIGURE_BUILD_SDK_UTILS_TMP}"
+do_configure_sdk_postfunc () {
#Set the build target to something else, so it does not overwrite
#the native tools
echo "TARGET = \"realmoc\"" >> ${S}/src/tools/moc/moc.pro
@@ -132,10 +135,12 @@ do_install() {
}
+INSTALL_BUILD_UTILS_TMP = ""
+INSTALL_BUILD_UTILS_TMP:sdk = "${INSTALL_BUILD_UTILS}"
INSTALL_BUILD_UTILS = ""
INSTALL_BUILD_UTILS:HOST_CPU_i686 = "do_install_linux_fixup"
INSTALL_BUILD_UTILS:HOST_LIBC_mingw = "do_install_mingw_fixup"
-do_install[postfuncs] += "${INSTALL_BUILD_UTILS}"
+do_install[postfuncs] += "${INSTALL_BUILD_UTILS_TMP}"
do_install_linux_fixup () {
#Set the correct name of the build linux utils
rm ${D}${bindir}/qmake