diff options
| -rw-r--r-- | recipes-qt/qt5/qt5.inc | 5 | ||||
| -rw-r--r-- | recipes-qt/qt5/qt5_arch.inc | 19 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase.inc | 3 |
3 files changed, 0 insertions, 27 deletions
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 79a4833c..0bf8e638 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc | |||
| @@ -7,14 +7,9 @@ inherit qmake5 | |||
| 7 | ICU = "icu " | 7 | ICU = "icu " |
| 8 | ICU_powerpc = "pango" | 8 | ICU_powerpc = "pango" |
| 9 | 9 | ||
| 10 | require qt5_arch.inc | ||
| 11 | |||
| 12 | QT_MODULE ?= "${BPN}" | 10 | QT_MODULE ?= "${BPN}" |
| 13 | 11 | ||
| 14 | do_configure() { | 12 | do_configure() { |
| 15 | set_arch | ||
| 16 | set_endian | ||
| 17 | |||
| 18 | qmake5_base_do_configure | 13 | qmake5_base_do_configure |
| 19 | } | 14 | } |
| 20 | 15 | ||
diff --git a/recipes-qt/qt5/qt5_arch.inc b/recipes-qt/qt5/qt5_arch.inc deleted file mode 100644 index 25fbf904..00000000 --- a/recipes-qt/qt5/qt5_arch.inc +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | inherit siteinfo | ||
| 2 | |||
| 3 | set_arch() { | ||
| 4 | case ${TARGET_ARCH} in | ||
| 5 | arm*) QT_ARCH=arm ;; | ||
| 6 | i*86*) QT_ARCH=i386 ;; | ||
| 7 | mips*) QT_ARCH=mips ;; | ||
| 8 | powerpc*) QT_ARCH=powerpc ;; | ||
| 9 | x86_64*) QT_ARCH=x86_64 ;; | ||
| 10 | esac | ||
| 11 | } | ||
| 12 | |||
| 13 | set_endian() { | ||
| 14 | if [ ${SITEINFO_ENDIANNESS} = "le" ] ; then | ||
| 15 | QT_ENDIAN="-little-endian" | ||
| 16 | elif [ ${SITEINFO_ENDIANNESS} = "be" ] ; then | ||
| 17 | QT_ENDIAN="-big-endian" | ||
| 18 | fi | ||
| 19 | } | ||
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 9624f1de..21a52733 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc | |||
| @@ -109,9 +109,6 @@ export OE_QMAKE_AR | |||
| 109 | export OE_QMAKE_STRIP | 109 | export OE_QMAKE_STRIP |
| 110 | 110 | ||
| 111 | do_configure() { | 111 | do_configure() { |
| 112 | set_arch | ||
| 113 | set_endian | ||
| 114 | |||
| 115 | # we need symlink in path relative to source, because | 112 | # we need symlink in path relative to source, because |
| 116 | # EffectivePaths:Prefix is relative to qmake location | 113 | # EffectivePaths:Prefix is relative to qmake location |
| 117 | if [ ! -e ${B}/bin/qmake ]; then | 114 | if [ ! -e ${B}/bin/qmake ]; then |
