Accepting request 211886 from KDE:Qt5

The WTF Platform.h file hard-coded PowerPC as big-endian.
This breaks building on little-endian PowerPC machines.

- Add ppc64le-support.patch: Support powerpc64le-linux. (forwarded request 211856 from uweigand)

OBS-URL: https://build.opensuse.org/request/show/211886
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtscript?expand=0&rev=7
This commit is contained in:
Tomáš Chvátal 2013-12-23 11:32:36 +00:00 committed by Git OBS Bridge
parent a58eb5a368
commit 316968e434
3 changed files with 37 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Dec 16 23:20:56 UTC 2013 - uweigand@de.ibm.com
- Add ppc64le-support.patch: Support powerpc64le-linux.
-------------------------------------------------------------------
Mon Dec 16 23:01:11 UTC 2013 - hrvoje.senjan@gmail.com

View File

@ -25,11 +25,13 @@ Summary: Qt 5 QtScript Library
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
Group: Development/Libraries/X11
Url: http://qt.digia.com
Source: %{tar_version}.tar.xz
%define base_name libqt5
%define real_version 5.2.0
%define so_version 5.2.0
%define tar_version qtscript-opensource-src-%{real_version}
Source: %{tar_version}.tar.xz
# PATCH-FIX-UPSTREAM ppc64le-support.diff uweigand@de.ibm.com -- add support for ppc64le
Patch1: ppc64le-support.patch
BuildRequires: libqt5-qtbase-devel >= %{version}
BuildRequires: libqt5-qtbase-private-headers-devel >= %{version}
BuildRequires: xz
@ -44,6 +46,7 @@ handling.
%prep
%setup -q -n qtscript-opensource-src-%{real_version}
%patch1 -p1
%package -n %libname
Summary: Qt 5 QtScript Library
@ -70,8 +73,8 @@ You need this package, if you want to compile programs with qtscript.
%package private-headers-devel
Summary: Non-ABI stable experimental API
Group: Development/Libraries/C and C++
Requires: libqt5-qtscript-devel = %{version}
Requires: libqt5-qtbase-private-headers-devel >= %{version}
Requires: libqt5-qtscript-devel = %{version}
Provides: libQt5Script-private-headers-devel = %{version}
# TODO: change to < on 5.2.1 update
Obsoletes: libQt5Script-private-headers-devel <= %{version}

27
ppc64le-support.patch Normal file
View File

@ -0,0 +1,27 @@
Index: qtscript-opensource-src-5.2.0-rc1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
===================================================================
--- qtscript-opensource-src-5.2.0-rc1.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+++ qtscript-opensource-src-5.2.0-rc1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
@@ -156,16 +156,22 @@
|| defined(__POWERPC__) \
|| defined(_M_PPC) \
|| defined(__PPC)
+#if !defined(__ppc64__) && !defined(__PPC64__)
#define WTF_CPU_PPC 1
+#endif
+#if !defined(__LITTLE_ENDIAN__)
#define WTF_CPU_BIG_ENDIAN 1
#endif
+#endif
/* CPU(PPC64) - PowerPC 64-bit */
#if defined(__ppc64__) \
|| defined(__PPC64__)
#define WTF_CPU_PPC64 1
+#if !defined(__LITTLE_ENDIAN__)
#define WTF_CPU_BIG_ENDIAN 1
#endif
+#endif
/* CPU(SH4) - SuperH SH-4 */
#if defined(__SH4__)