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 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
parent
48138bfb27
commit
34a4b6bc24
|
@ -7,14 +7,9 @@ inherit qmake5
|
||||||
ICU = "icu "
|
ICU = "icu "
|
||||||
ICU_powerpc = "pango"
|
ICU_powerpc = "pango"
|
||||||
|
|
||||||
require qt5_arch.inc
|
|
||||||
|
|
||||||
QT_MODULE ?= "${BPN}"
|
QT_MODULE ?= "${BPN}"
|
||||||
|
|
||||||
do_configure() {
|
do_configure() {
|
||||||
set_arch
|
|
||||||
set_endian
|
|
||||||
|
|
||||||
qmake5_base_do_configure
|
qmake5_base_do_configure
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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
|
|
||||||
}
|
|
|
@ -109,9 +109,6 @@ export OE_QMAKE_AR
|
||||||
export OE_QMAKE_STRIP
|
export OE_QMAKE_STRIP
|
||||||
|
|
||||||
do_configure() {
|
do_configure() {
|
||||||
set_arch
|
|
||||||
set_endian
|
|
||||||
|
|
||||||
# we need symlink in path relative to source, because
|
# we need symlink in path relative to source, because
|
||||||
# EffectivePaths:Prefix is relative to qmake location
|
# EffectivePaths:Prefix is relative to qmake location
|
||||||
if [ ! -e ${B}/bin/qmake ]; then
|
if [ ! -e ${B}/bin/qmake ]; then
|
||||||
|
|
Loading…
Reference in New Issue