diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 12b5872..6f466ac 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -27,6 +27,8 @@ Patch2: qtbase-multilib_optflags.patch # https://bugreports.qt-project.org/browse/QTBUG-27195 # NEEDS REBASE Patch50: qt5-poll.patch +# fix ppc64 build +Patch51: qtbase-opensource-src-5.1.1-ppc64.patch ##upstream patches @@ -156,6 +158,7 @@ Qt5 libraries used for drawing widgets and OpenGL items. rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags #patch50 -p1 -b .poll +%patch51 -p1 -b .ppc64 # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` diff --git a/qtbase-opensource-src-5.1.1-ppc64.patch b/qtbase-opensource-src-5.1.1-ppc64.patch new file mode 100644 index 0000000..97e7a86 --- /dev/null +++ b/qtbase-opensource-src-5.1.1-ppc64.patch @@ -0,0 +1,21 @@ +diff -up qtbase-opensource-src-5.1.1/src/3rdparty/sha3/KeccakF-1600-opt64.c.ppc64 qtbase-opensource-src-5.1.1/src/3rdparty/sha3/KeccakF-1600-opt64.c +--- qtbase-opensource-src-5.1.1/src/3rdparty/sha3/KeccakF-1600-opt64.c.ppc64 2013-08-25 13:03:42.000000000 -0500 ++++ qtbase-opensource-src-5.1.1/src/3rdparty/sha3/KeccakF-1600-opt64.c 2013-09-06 22:29:03.687899748 -0500 +@@ -324,7 +324,7 @@ static void KeccakPermutation(unsigned c + KeccakPermutationOnWords((UINT64*)state); + } + +-#if 0 // Unused in the Qt configuration ++#if 1 // Unused in the Qt configuration + static void fromBytesToWord(UINT64 *word, const UINT8 *bytes) + { + unsigned int i; +@@ -445,7 +445,7 @@ static void KeccakAbsorb(unsigned char * + #endif + } + +-#if 0 // Unused in the Qt configuration ++#if 1 // Unused in the Qt configuration + static void fromWordToBytes(UINT8 *bytes, const UINT64 word) + { + unsigned int i;