rpms/qt5-qtbase
6
0
Fork 0
Code Issues Pull Requests Releases Activity

ExcludeArch: ppc64 ppc (#1005482)

Browse Source
This commit is contained in:
Rex Dieter 2013-09-07 08:52:32 -05:00
parent 342396e85a
commit aca3317619
2 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qt5-qtbase.spec
View File

@ -9,13 +9,16 @@
Summary: Qt5 - QtBase components Summary: Qt5 - QtBase components
Name: qt5-qtbase Name: qt5-qtbase
Version: 5.1.1 Version: 5.1.1
Release: 2%{?dist} Release: 3%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
Url: http://qt-project.org/ Url: http://qt-project.org/
Source0: http://download.qt-project.org/official_releases/qt/5.1/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz Source0: http://download.qt-project.org/official_releases/qt/5.1/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
# http://bugzilla.redhat.com/1005482
ExcludeArch: ppc64 ppc
# help build on some lowmem archs, e.g. drop hard-coded -O3 optimization on some files # help build on some lowmem archs, e.g. drop hard-coded -O3 optimization on some files
Patch1: qtbase-opensource-src-5.0.2-lowmem.patch Patch1: qtbase-opensource-src-5.0.2-lowmem.patch
@ -27,8 +30,6 @@ Patch2: qtbase-multilib_optflags.patch
# https://bugreports.qt-project.org/browse/QTBUG-27195 # https://bugreports.qt-project.org/browse/QTBUG-27195
# NEEDS REBASE # NEEDS REBASE
Patch50: qt5-poll.patch Patch50: qt5-poll.patch
# fix ppc64 build
Patch51: qtbase-opensource-src-5.1.1-ppc64.patch
##upstream patches ##upstream patches
@ -158,7 +159,6 @@ Qt5 libraries used for drawing widgets and OpenGL items.
rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
#patch50 -p1 -b .poll #patch50 -p1 -b .poll
%patch51 -p1 -b .ppc64
# drop -fexceptions from $RPM_OPT_FLAGS # drop -fexceptions from $RPM_OPT_FLAGS
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@ -530,6 +530,9 @@ popd
%changelog %changelog
* Sat Sep 07 2013 Rex Dieter <rdieter@fedoraproject.org> 5.1.1-3
- ExcludeArch: ppc64 ppc (#1005482)
* Fri Sep 06 2013 Rex Dieter <rdieter@fedoraproject.org> 5.1.1-2 * Fri Sep 06 2013 Rex Dieter <rdieter@fedoraproject.org> 5.1.1-2
- BR: pkgconfig(libudev) pkgconfig(xkbcommon) pkgconfig(xcb-xkb) - BR: pkgconfig(libudev) pkgconfig(xkbcommon) pkgconfig(xcb-xkb)

21
qtbase-opensource-src-5.1.1-ppc64.patch
View File

@ -1,21 +0,0 @@
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;