From 90f12d395b90eef759a5b08d10b69aaf22c63a6f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 26 Mar 2014 15:34:59 -0500 Subject: [PATCH] support ppc64le arch (#1081216) --- ...e-opensource-src-4.8-ppc64le_support.patch | 25 +++++++++++++++++++ qt.spec | 16 +++++++----- 2 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 qt-everywhere-opensource-src-4.8-ppc64le_support.patch diff --git a/qt-everywhere-opensource-src-4.8-ppc64le_support.patch b/qt-everywhere-opensource-src-4.8-ppc64le_support.patch new file mode 100644 index 0000000..3438e25 --- /dev/null +++ b/qt-everywhere-opensource-src-4.8-ppc64le_support.patch @@ -0,0 +1,25 @@ +--- qt-everywhere-opensource-src-4.8.5/configure 2013-10-10 00:40:17.000000000 +0200 ++++ qt-everywhere-opensource-src-4.8.5/configure 2013-10-10 13:47:49.000000000 +0200 +@@ -3235,6 +3235,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then + fi + CFG_HOST_ARCH=powerpc + ;; ++ ppc64le:*:*|*:ppc64le:*|*:*:ppc64le) ++ if [ "$OPT_VERBOSE" = "yes" ]; then ++ echo " 64-bit PowerPC little endian (ppc64le)" ++ fi ++ CFG_HOST_ARCH=powerpc ++ ;; + *:*:s390*) + if [ "$OPT_VERBOSE" = "yes" ]; then + echo " IBM S/390 (s390)" +@@ -3299,6 +3305,9 @@ if [ "$PLATFORM" != "$XPLATFORM" -a "$CF + arm*) + CFG_ARCH=arm + ;; ++ ppc64le) ++ CFG_ARCH=powerpc ++ ;; + *) + CFG_ARCH="$CFG_EMBEDDED" + ;; diff --git a/qt.spec b/qt.spec index 3041aad..0b715ba 100644 --- a/qt.spec +++ b/qt.spec @@ -5,8 +5,8 @@ %define no_pch -no-pch # See http://bugzilla.redhat.com/223663 -%define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparcv9 -%define multilib_basearchs x86_64 ppc64 s390x sparc64 +%define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparcv9 ppc64le +%define multilib_basearchs x86_64 ppc64 s390x sparc64 ppc64le %if 0%{?fedora} > 16 || 0%{?rhel} > 6 # use external qt_settings pkg @@ -25,7 +25,7 @@ Summary: Qt toolkit Name: qt Epoch: 1 Version: 4.8.5 -Release: 23%{?dist} +Release: 24%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT @@ -162,9 +162,10 @@ Patch103: QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch # https://bugreports.qt-project.org/browse/QTBUG-22829 Patch113: qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch -# aarch64 support -# https://bugreports.qt-project.org/browse/QTBUG-35442 +# aarch64 support, https://bugreports.qt-project.org/browse/QTBUG-35442 Patch180: qt-aarch64.patch +# ppc64le support +Patch181: qt-everywhere-opensource-src-4.8-ppc64le_support.patch ## upstream git # related prereq patch to 0162 below @@ -539,8 +540,8 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags %patch103 -p1 -R -b .QTBUG-15319 %patch113 -p1 -b .QTBUG-22829 -# aarch64 %patch180 -p1 -b .aarch64 +%patch181 -p1 -b .ppc64le # security fixes %patch1147 -p1 -b .0147 @@ -1245,6 +1246,9 @@ fi %changelog +* Wed Mar 26 2014 Rex Dieter 4.8.5-24 +- support ppc64le arch (#1081216) + * Sat Mar 08 2014 Kevin Kofler 4.8.5-23 - fix QMAKE_STRIP handling (#1074041)