qtbase: drop setting arch and endian

* endian option was removed from configure
* arch/host-arch option is now deprecated and configure shows
  warning when it's used
* both are now autodetected

(From meta-qt5 rev: 34a4b6bc246e8c6ce4e39a12ea7bde3e1a76d1d6)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-qt5/recipes-qt/qt5/qt5.inc b/meta-qt5/recipes-qt/qt5/qt5.inc
index 79a4833..0bf8e63 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qt5.inc
+++ b/meta-qt5/recipes-qt/qt5/qt5.inc
@@ -7,14 +7,9 @@ inherit qmake5
 ICU = "icu "
 ICU_powerpc = "pango"
 
-require qt5_arch.inc
-
 QT_MODULE ?= "${BPN}"
 
 do_configure() {
-    set_arch
-    set_endian
-
     qmake5_base_do_configure
 }
 

diff --git a/meta-qt5/recipes-qt/qt5/qt5_arch.inc b/meta-qt5/recipes-qt/qt5/qt5_arch.inc
deleted file mode 100644 (file)
index 25fbf90..0000000
--- a/meta-qt5/recipes-qt/qt5/qt5_arch.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-inherit siteinfo
-
-set_arch() {
-    case ${TARGET_ARCH} in
-        arm*)     QT_ARCH=arm ;;
-        i*86*)    QT_ARCH=i386 ;;
-        mips*)    QT_ARCH=mips ;;
-        powerpc*) QT_ARCH=powerpc ;;
-        x86_64*)  QT_ARCH=x86_64 ;;
-    esac
-}
-
-set_endian() {
-    if [ ${SITEINFO_ENDIANNESS} = "le" ] ; then
-        QT_ENDIAN="-little-endian"
-    elif [ ${SITEINFO_ENDIANNESS} = "be" ] ; then
-        QT_ENDIAN="-big-endian"
-    fi
-}

diff --git a/meta-qt5/recipes-qt/qt5/qtbase.inc b/meta-qt5/recipes-qt/qt5/qtbase.inc
index 9624f1d..21a5273 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qtbase.inc
+++ b/meta-qt5/recipes-qt/qt5/qtbase.inc
@@ -109,9 +109,6 @@ export OE_QMAKE_AR
 export OE_QMAKE_STRIP
 
 do_configure() {
-    set_arch
-    set_endian
-
     # we need symlink in path relative to source, because
     # EffectivePaths:Prefix is relative to qmake location
     if [ ! -e ${B}/bin/qmake ]; then