aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@alpinelinux.org>2021-06-10 21:19:59 +0000
committerCarlo Landmeter <clandmeter@alpinelinux.org>2021-06-10 21:23:35 +0000
commitae484a34fa092f105752658fa3379a2111eb49ba (patch)
tree721a2ba1852c5ad8e23771a624fc30c10699f98a
parente5a8e68f38448e4a98a19e104f1737b4cadf3ea4 (diff)
downloadaports-ae484a34fa092f105752658fa3379a2111eb49ba.tar.gz
aports-ae484a34fa092f105752658fa3379a2111eb49ba.tar.bz2
aports-ae484a34fa092f105752658fa3379a2111eb49ba.tar.xz
community/qt5-qtdeclarative: fix build on riscv64
needs to link to gcc libatomic but qmake does not support LDFLAGS
-rw-r--r--community/qt5-qtdeclarative/APKBUILD5
-rw-r--r--community/qt5-qtdeclarative/link-libatomic-on-rv64.patch11
2 files changed, 13 insertions, 3 deletions
diff --git a/community/qt5-qtdeclarative/APKBUILD b/community/qt5-qtdeclarative/APKBUILD
index c24e4b3efb..c6a193d400 100644
--- a/community/qt5-qtdeclarative/APKBUILD
+++ b/community/qt5-qtdeclarative/APKBUILD
@@ -16,6 +16,7 @@ makedepends="
subpackages="$pkgname-dev $pkgname-dbg"
source="https://invent.kde.org/qt/qt/qtdeclarative/-/archive/$_commit/qtdeclarative-$_commit.tar.gz
qt-musl-stackbottom.patch
+ link-libatomic-on-rv64.patch
"
builddir="$srcdir/qtdeclarative-$_commit"
@@ -34,9 +35,6 @@ build() {
ln -s /usr/bin/python3 python
export PATH="$(pwd):$PATH"
- # https://github.com/riscv/riscv-gnu-toolchain/issues/183#issuecomment-253721765
- [ "$CARCH" = "riscv64" ] && export LDFLAGS="$LDFLAGS -latomic"
-
qmake-qt5
make
}
@@ -71,4 +69,5 @@ dev() {
sha512sums="
8d3aefeb7911fed45a25cad2057299bbe1a9ea5fe22bdff660de979f332bee8bc6b7a8534f8b6428a3d0f42912e57178bdb669380f88d48ab6f9e4edc26ec91d qtdeclarative-0dda47d9f1a22567ad8f1266be2f0cd8a9226c7f.tar.gz
235091cc1da51c31165a99932c95543d999c0f21b2c6b4318306b647662d420f88d7270ec21db7417fe9f8d87bfa3e5f01b6465c3542da024dd1623ef0a87681 qt-musl-stackbottom.patch
+d048e8d04837ebab8439cc3d499a9a74114ae65357bad54123006d8b772b96ed907b20d781b95a6d71dd2efdb6e4e5a044a1205491df6e28d991989476bf0e55 link-libatomic-on-rv64.patch
"
diff --git a/community/qt5-qtdeclarative/link-libatomic-on-rv64.patch b/community/qt5-qtdeclarative/link-libatomic-on-rv64.patch
new file mode 100644
index 0000000000..85305226b1
--- /dev/null
+++ b/community/qt5-qtdeclarative/link-libatomic-on-rv64.patch
@@ -0,0 +1,11 @@
+--- ./src/qml/qml.pro.orig
++++ ./src/qml/qml.pro
+@@ -12,6 +12,8 @@
+
+ DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
+
++unix:LIBS += -latomic
++
+ msvc:equals(QT_ARCH, i386): QMAKE_LFLAGS += /BASE:0x66000000
+ msvc:DEFINES *= _CRT_SECURE_NO_WARNINGS
+ win32:!winrt:LIBS += -lshell32