[packages/qt-creator] - fix build on x32
baggins
baggins at pld-linux.org
Sat May 11 13:33:39 CEST 2019
commit 17e2d2277735281a73d86c7f1f3588aac5795ac1
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat May 11 13:33:18 2019 +0200
- fix build on x32
qt-creator.spec | 4 ++++
x32.patch | 12 ++++++++++++
2 files changed, 16 insertions(+)
---
diff --git a/qt-creator.spec b/qt-creator.spec
index e8900cc..21079ae 100644
--- a/qt-creator.spec
+++ b/qt-creator.spec
@@ -8,6 +8,7 @@ License: LGPL v2.1
Group: X11/Development/Tools
Source0: http://download.qt.io/official_releases/qtcreator/4.8/%{version}/%{name}-opensource-src-%{version}.tar.xz
# Source0-md5: bf5b9953cfec44aa2504e30cb81768e6
+Patch0: x32.patch
URL: http://doc.qt.io/qt-5/topics-app-development.html
BuildRequires: Qt5Concurrent-devel >= 5.9.0
BuildRequires: Qt5Designer-devel >= 5.9.0
@@ -52,6 +53,9 @@ Qt.
%prep
%setup -q -n %{name}-opensource-src-%{version}
+%ifarch x32
+%patch0 -p1
+%endif
# fix unresolved symbols in libQtcSsh
echo >> src/libs/ssh/ssh_dependencies.pri
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..beb70b2
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,12 @@
+--- qt-creator-opensource-src-4.8.2/src/libs/botan/botan.pro~ 2019-05-11 12:45:09.000000000 +0200
++++ qt-creator-opensource-src-4.8.2/src/libs/botan/botan.pro 2019-05-11 12:45:26.217492890 +0200
+@@ -16,8 +16,7 @@
+ msvc: BOTAN_CC_TYPE = msvc
+ else: clang: BOTAN_CC_TYPE = clang
+ else: BOTAN_CC_TYPE = gcc
+-contains(QT_ARCH, i386): BOTAN_ARCH_SWITCH = "--cpu=x86"
+-else: contains(QT_ARCH, x86_64): BOTAN_ARCH_SWITCH = "--cpu=x86_64"
++BOTAN_ARCH_SWITCH = "--cpu=x32"
+ BOTAN_MODULES = aes aes_ssse3 auto_rng bigint block cbc ctr des dh dsa ec_group ecdh ecdsa entropy \
+ filters hmac mode_pad pubkey rsa sha1 sha1_sse2 sha1_x86 sha2_32 sha2_32_x86 \
+ sha2_64 simd system_rng,emsa_pkcs1,pbes2,pbkdf2
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt-creator.git/commitdiff/17e2d2277735281a73d86c7f1f3588aac5795ac1
More information about the pld-cvs-commit
mailing list