Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix -pthread in qt5-base instead #193

Merged
merged 1 commit into from
Oct 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions qt5-base/riscv64.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Index: PKGBUILD
===================================================================
--- PKGBUILD (revision 422469)
--- PKGBUILD (revision 424590)
+++ PKGBUILD (working copy)
@@ -13,7 +13,7 @@
depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 'fontconfig' 'xdg-utils'
Expand All @@ -11,7 +11,16 @@ Index: PKGBUILD
'gtk3' 'libpulse' 'cups' 'freetds' 'vulkan-headers' 'git')
optdepends=('qt5-svg: to use SVG icon themes'
'qt5-wayland: to run Qt applications in a Wayland session'
@@ -63,7 +63,7 @@
@@ -47,6 +47,8 @@

patch -p1 < ../qt5-base-cflags.patch # Use system CFLAGS in qmake
patch -p1 < ../qt5-base-nostrip.patch # Don't strip binaries with qmake
+
+ sed -i 's/-lpthread/-pthread/' mkspecs/common/linux.conf src/corelib/configure.json
}

build() {
@@ -60,7 +62,7 @@
-datadir /usr/share/qt \
-sysconfdir /etc/xdg \
-examplesdir /usr/share/doc/qt/examples \
Expand All @@ -20,7 +29,7 @@ Index: PKGBUILD
-system-sqlite \
-openssl-linked \
-nomake examples \
@@ -73,7 +73,6 @@
@@ -70,7 +72,6 @@
-journald \
-no-mimetype-database \
-no-use-gold-linker \
Expand Down
13 changes: 0 additions & 13 deletions qt5-declarative/riscv64.patch

This file was deleted.