From c6c0dd0675e46762e9c99d718578175f08ad849b Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Tue, 20 Sep 2016 18:24:13 +0200 Subject: [PATCH] qt5: no float-abi dances for aarch64. --- srcpkgs/qt5/template | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index 9aaf840f80c..d34ec51e044 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -101,9 +101,9 @@ _create_config() { echo >> ${specs}/${device}/qmake.conf # Fake distro name to tell we want control echo "DISTRO = arch" >> ${specs}/${device}/qmake.conf - # Hard float on armv6, armv7 and aarch64, not on armv5tel + # Hard float on armv6, armv7, not on armv5tel case "$XBPS_TARGET_MACHINE" in - armv6*|armv7*|aarch64) + armv6*|armv7*) echo "DISTRO_OPTS += hard-float" >> ${specs}/${device}/qmake.conf ;; esac @@ -117,7 +117,12 @@ _create_config() { # FIXME: is this required? echo "QMAKE_LIBS_OPENGL_ES2 = -lEGL -lGLESv2" >> ${specs}/${device}/qmake.conf echo >> ${specs}/${device}/qmake.conf - echo "include(../common/linux_arm_device_post.conf)" >> ${specs}/${device}/qmake.conf + case "$XBPS_TARGET_MACHINE" in + arm*) + echo "include(../common/linux_arm_device_post.conf)" >> ${specs}/${device}/qmake.conf ;; + *) + echo "include(../common/linux_device_post.conf)" >> ${specs}/${device}/qmake.conf ;; + esac echo "load(qt_config)" >> ${specs}/${device}/qmake.conf echo '#include "../../linux-g++/qplatformdefs.h"' > ${specs}/${device}/qplatformdefs.h