Skip to contentSkip to conversation

qt4-tools-nativesdk: -arch is required for nativesdk build

PATCH Applied Ilya Yanok 2 participants 2 messages May 12, 2011 – May 13, 2011

lore
Share & tools
lore

Ilya Yanok

author
#0 lore raw

PATCH 1/1 qt4-tools-nativesdk: -arch is required for nativesdk build

We need to pass correct -arch option to configure to fix building in case of SDK_ARCH != BUILD_ARCH.

---
 meta/recipes-qt/qt4/qt4-tools-nativesdk.inc |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
meta/recipes-qt/qt4/qt4-tools-nativesdk.inc +3 -0
index f273c9f..5faf40c 100644
@@ -25,6 +25,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
                     file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
                     file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
 
+require qt4_arch.inc
+
 # FIXME: make it work with "${STAGING_BINDIR_NATIVE}/pkg-config --cflags dbus-1"
 EXTRA_OECONF = "-prefix ${prefix} \
                 -qt-libjpeg -qt-gif -system-zlib \
@@ -37,6 +39,7 @@ EXTRA_OECONF = "-prefix ${prefix} \
                 -verbose -release -fast -static \
                 -platform ${TARGET_OS}-oe-g++ \
                 -xplatform ${TARGET_OS}-oe-g++ \
+                -arch ${@qt_arch(d)} \
                 -embedded -no-freetype -no-glib -no-iconv \
                 -qt3support \
                 -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include \
Signature · 1 line
1.7.4.4
Applied
#1 lore raw
Quoted 22 lines · Ilya Yanok

We need to pass correct -arch option to configure to fix building in case of SDK_ARCH != BUILD_ARCH.

---
  meta/recipes-qt/qt4/qt4-tools-nativesdk.inc |    3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)
meta/recipes-qt/qt4/qt4-tools-nativesdk.inc +2 -0
index f273c9f..5faf40c 100644
@@ -25,6 +25,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
                      file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
                      file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
 
+require qt4_arch.inc
+
  # FIXME: make it work with "${STAGING_BINDIR_NATIVE}/pkg-config --cflags dbus-1"
  EXTRA_OECONF = "-prefix ${prefix} \
                  -qt-libjpeg -qt-gif -system-zlib \

meta/recipes-qt/qt4/qt4-tools-nativesdk.inc EXTRA_OECONF = "-prefix ${prefix} \ · line 45

Quoted 7 lines
meta/recipes-qt/qt4/qt4-tools-nativesdk.inc +1 -0
@@ -37,6 +39,7 @@ EXTRA_OECONF = "-prefix ${prefix} \
                  -verbose -release -fast -static \
                  -platform ${TARGET_OS}-oe-g++ \
                  -xplatform ${TARGET_OS}-oe-g++ \
+                -arch ${@qt_arch(d)} \
                  -embedded -no-freetype -no-glib -no-iconv \
                  -qt3support \
                  -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include \

Merged to oe-core and poky/master.

In the future please send changes that are meta (oe-core) to the oe-core alias only, no need to cross-post.

Thanks
Sau!