diff options
| author | Tuan M. Hoang <tmhoang@flatglobe.org> | 2017-04-09 02:34:11 -0400 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2017-04-10 13:15:37 +0000 |
| commit | 03b19d96135e99296c9e511775f4fdd62dbfb56b (patch) | |
| tree | b3869a24f19884fbf02211eb248da9b1d4a2aeca /main | |
| parent | fdb854521b1a40bbc06b6aeafb0059018ed82101 (diff) | |
| download | aports-03b19d96135e99296c9e511775f4fdd62dbfb56b.tar.bz2 aports-03b19d96135e99296c9e511775f4fdd62dbfb56b.tar.xz | |
main/qt5-qtscript: add s390x support
Patch from fedora team
Diffstat (limited to 'main')
| -rw-r--r-- | main/qt5-qtscript/APKBUILD | 10 | ||||
| -rw-r--r-- | main/qt5-qtscript/qtscript-opensource-src-5.5.0-s390.patch | 31 |
2 files changed, 36 insertions, 5 deletions
diff --git a/main/qt5-qtscript/APKBUILD b/main/qt5-qtscript/APKBUILD index a7a1bce2fd..9c78dec634 100644 --- a/main/qt5-qtscript/APKBUILD +++ b/main/qt5-qtscript/APKBUILD @@ -5,7 +5,7 @@ _ver=${pkgver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} _V=${_ver/rc/RC} -pkgrel=0 +pkgrel=1 pkgdesc="Qt5 - QtScript component" url="http://qt-project.org/" arch="all" @@ -19,7 +19,8 @@ case $pkgver in *_beta*|*_rc*) _rel=development_releases;; *) _rel=official_releases;; esac -source="http://download.qt-project.org/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtscript-opensource-src-$_V.tar.xz" +source="http://download.qt-project.org/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtscript-opensource-src-$_V.tar.xz + qtscript-opensource-src-5.5.0-s390.patch" _builddir="$srcdir"/qtscript-opensource-src-$_V prepare() { @@ -42,6 +43,5 @@ package() { make INSTALL_ROOT="$pkgdir" install || return 1 } -md5sums="631d38f242295dd026541c31d15e3bae qtscript-opensource-src-5.6.1.tar.xz" -sha256sums="1cb2ef87aeff3d8d05685279b521c332b752e4559f8e2138fd36d3eb682bf79f qtscript-opensource-src-5.6.1.tar.xz" -sha512sums="40e8babbf9a5e9ffd1f53b2619c885a3489495690e52f57d45f74360eed59d42b9a74832c30b0101f0d3e73ba9e8e73b3481d2f1d326378cc927f6cf8599a042 qtscript-opensource-src-5.6.1.tar.xz" +sha512sums="40e8babbf9a5e9ffd1f53b2619c885a3489495690e52f57d45f74360eed59d42b9a74832c30b0101f0d3e73ba9e8e73b3481d2f1d326378cc927f6cf8599a042 qtscript-opensource-src-5.6.1.tar.xz +9253275dc268c4b8900dcefb66e6280076dc948bdf0765e0ba3e7c0ec690efaa3c61c5403560a8b4ee9167b43079fff9383e412f8fb912274f410d46fef8acdb qtscript-opensource-src-5.5.0-s390.patch" diff --git a/main/qt5-qtscript/qtscript-opensource-src-5.5.0-s390.patch b/main/qt5-qtscript/qtscript-opensource-src-5.5.0-s390.patch new file mode 100644 index 0000000000..e7871f4bc4 --- /dev/null +++ b/main/qt5-qtscript/qtscript-opensource-src-5.5.0-s390.patch @@ -0,0 +1,31 @@ +diff -up qtscript-opensource-src-5.5.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 qtscript-opensource-src-5.5.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +--- qtscript-opensource-src-5.5.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 2015-06-29 15:05:58.000000000 -0500 ++++ qtscript-opensource-src-5.5.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2015-07-16 09:57:18.963167137 -0500 +@@ -226,6 +226,18 @@ + #define WTF_CPU_SPARC 1 + #endif + ++/* CPU(S390X) - S390 64-bit */ ++#if defined(__s390x__) ++#define WTF_CPU_S390X 1 ++#define WTF_CPU_BIG_ENDIAN 1 ++#endif ++ ++/* CPU(S390) - S390 32-bit */ ++#if defined(__s390__) && !defined(__s390x__) ++#define WTF_CPU_S390 1 ++#define WTF_CPU_BIG_ENDIAN 1 ++#endif ++ + /* CPU(X86) - i386 / x86 32-bit */ + #if defined(__i386__) \ + || defined(i386) \ +@@ -950,7 +962,7 @@ + #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) + #if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) + #define WTF_USE_JSVALUE64 1 +-#elif CPU(ARM) || CPU(PPC64) ++#elif CPU(ARM) || CPU(PPC64) || CPU(S390X) + #define WTF_USE_JSVALUE32 1 + #elif OS(WINDOWS) && COMPILER(MINGW) + /* Using JSVALUE32_64 causes padding/alignement issues for JITStubArg |