snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

qt6-base: fix QMAKE_LIBS_LIBATOMIC for armv6 

See: /usr/lib/qt6/mkspecs/modules/qt_lib_core_private.pri

It should say "-latomic" instead of "atomic".
This commit is contained in:
Đoàn Trần Công Danh 2021-05-29 11:49:19 +07:00 committed by Đoàn Trần Công Danh
parent ba337c89d9
commit 45bb4ac181
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
srcpkgs/qt6-base/patches/libatomic.patch Normal file
View File

@ -0,0 +1,14 @@
Index: cmake/FindWrapAtomic.cmake
===================================================================
--- cmake/FindWrapAtomic.cmake.orig
+++ cmake/FindWrapAtomic.cmake
@@ -38,7 +38,8 @@ endif()
add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
if(HAVE_STDATOMIC_WITH_LIB)
- target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
+ find_library(LIBATOMIC atomic REQUIRED)
+ target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC})
endif()
set(WrapAtomic_FOUND 1)

4
srcpkgs/qt6-base/template
View File

@ -1,7 +1,7 @@
# Template file for 'qt6-base' # Template file for 'qt6-base'
pkgname=qt6-base pkgname=qt6-base
version=6.1.0 version=6.1.0
revision=1 revision=2
wrksrc="qtbase-everywhere-src-${version}" wrksrc="qtbase-everywhere-src-${version}"
build_style=cmake build_style=cmake
configure_args="-DINSTALL_DATADIR=share/qt6 configure_args="-DINSTALL_DATADIR=share/qt6
@ -25,7 +25,7 @@ makedepends="zlib-devel libzstd-devel dbus-devel
sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader" sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader"
short_desc="Cross-platform application and UI framework (QT6)" short_desc="Cross-platform application and UI framework (QT6)"
maintainer="John <me@johnnynator.dev>" maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
homepage="https://www.qt.io" homepage="https://www.qt.io"
distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtbase-everywhere-src-${version}.tar.xz" distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtbase-everywhere-src-${version}.tar.xz"
checksum=f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4 checksum=f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4