diff --git a/classes/populate_sdk_qt6_base.bbclass b/classes/populate_sdk_qt6_base.bbclass index f7ea63c..2e6a3fa 100644 --- a/classes/populate_sdk_qt6_base.bbclass +++ b/classes/populate_sdk_qt6_base.bbclass @@ -46,13 +46,13 @@ create_qt6_sdk_files () { echo 'export OE_QMAKE_AR="$AR"' >> $script echo 'export OE_QMAKE_STRIP="$STRIP"' >> $script echo 'export OE_QMAKE_OBJCOPY="$OBJCOPY"' >> $script - echo 'export OE_QMAKE_NM="$NM"' >> $script + echo 'export OE_QMAKE_AR_LTCG="${HOST_PREFIX}gcc-ar"' >> $script mkspec=${SDK_OUTPUT}${SDKTARGETSYSROOT}${QT6_INSTALL_MKSPECSDIR}/linux-oe-g++/qmake.conf echo "count(QMAKE_AR, 1): QMAKE_AR = ${AR} cqs" >> $mkspec + echo "count(QMAKE_AR_LTCG, 1): QMAKE_AR_LTCG = ${HOST_PREFIX}gcc-ar cqs" >> $mkspec echo "isEmpty(QMAKE_STRIP): QMAKE_STRIP = ${STRIP}" >> $mkspec echo "isEmpty(QMAKE_OBJCOPY): QMAKE_OBJCOPY = ${OBJCOPY}" >> $mkspec - echo "count(QMAKE_NM, 1): QMAKE_NM = ${NM} -P" >> $mkspec echo "isEmpty(QMAKE_CC): QMAKE_CC = ${CC}" >> $mkspec echo "isEmpty(QMAKE_CFLAGS): QMAKE_CFLAGS = ${CFLAGS}" >> $mkspec echo "isEmpty(QMAKE_CXX): QMAKE_CXX = ${CXX}" >> $mkspec diff --git a/classes/qt6-qmake.bbclass b/classes/qt6-qmake.bbclass index ba65fdc..5c38462 100644 --- a/classes/qt6-qmake.bbclass +++ b/classes/qt6-qmake.bbclass @@ -72,7 +72,7 @@ export OE_QMAKE_LDFLAGS = "${LDFLAGS}" export OE_QMAKE_AR = "${AR}" export OE_QMAKE_STRIP = "echo" export OE_QMAKE_OBJCOPY = "${OBJCOPY}" -export OE_QMAKE_NM = "${NM}" +export OE_QMAKE_AR_LTCG = "${HOST_PREFIX}gcc-ar" # qmake reads if from shell environment export OE_QMAKE_QTCONF_PATH = "${WORKDIR}/qt.conf" diff --git a/recipes-qt/qt6/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt6/qtbase/0001-Add-linux-oe-g-platform.patch index e130311..e5fbd68 100644 --- a/recipes-qt/qt6/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt6/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From 9fa27feda95c0cf6a459c916337ab65e8cb220b4 Mon Sep 17 00:00:00 2001 +From ddf6b576c9d5024b8b1a7ceaf9a4b1c26afa3b19 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH] Add linux-oe-g++ platform @@ -62,7 +62,7 @@ index 7777e615bd..8d792fa70a 100644 cmd = perl -w $$system_path($${cmd}.pl) diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 0000000000..c2b7b20fdc +index 0000000000..99ff3741d3 --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf @@ -0,0 +1,38 @@ @@ -79,7 +79,6 @@ index 0000000000..c2b7b20fdc +QMAKE_AR = $$(OE_QMAKE_AR) cqs +QMAKE_STRIP = $$(OE_QMAKE_STRIP) +QMAKE_OBJCOPY = $$(OE_QMAKE_OBJCOPY) -+QMAKE_NM = $${OE_QMAKE_NM} -P + +include(../common/gcc-base-unix.conf) + @@ -98,7 +97,8 @@ index 0000000000..c2b7b20fdc +QMAKE_LINK_SHLIB = $$(OE_QMAKE_LINK) +QMAKE_LINK_C = $$(OE_QMAKE_LINK) +QMAKE_LINK_C_SHLIB = $$(OE_QMAKE_LINK) -+QMAKE_CFLAGS_ISYSTEM = ++ ++QMAKE_AR_LTCG = $$(OE_QMAKE_AR_LTCG) cqs + +include(../oe-device-extra.pri) +