From cc2cd6b42610db1c5f1c167b1a500c55e5956274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 29 May 2021 11:49:19 +0700 Subject: [PATCH] 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". --- .../{add-the-D.patch => libatomic.patch} | 17 +++++++++++++---- srcpkgs/qt6-base/template | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) rename srcpkgs/qt6-base/patches/{add-the-D.patch => libatomic.patch} (52%) diff --git a/srcpkgs/qt6-base/patches/add-the-D.patch b/srcpkgs/qt6-base/patches/libatomic.patch similarity index 52% rename from srcpkgs/qt6-base/patches/add-the-D.patch rename to srcpkgs/qt6-base/patches/libatomic.patch index 94d2fc030304..654b6bbdf57a 100644 --- a/srcpkgs/qt6-base/patches/add-the-D.patch +++ b/srcpkgs/qt6-base/patches/libatomic.patch @@ -1,15 +1,24 @@ ---- cmake/FindWrapAtomic.cmake 2021-04-30 11:31:33.000000000 +0200 -+++ - 2021-05-06 15:56:49.553742705 +0200 -@@ -31,9 +31,9 @@ +Index: cmake/FindWrapAtomic.cmake +=================================================================== +--- cmake/FindWrapAtomic.cmake.orig ++++ cmake/FindWrapAtomic.cmake +@@ -30,15 +30,15 @@ int main(int, char **) + check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC) if(NOT HAVE_STDATOMIC) - set(_req_libraries "${CMAKE_REQUIRE_LIBRARIES}") - set(CMAKE_REQUIRE_LIBRARIES "atomic") + set(_req_libraries "${CMAKE_REQUIRED_LIBRARIES}") -+ set(CMAKE_REQUIRED_LIBRARIES "atomic") ++ set(CMAKE_REQUIRED_LIBRARIES -latomic) check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC_WITH_LIB) - set(CMAKE_REQUIRE_LIBRARIES "${_req_libraries}") + set(CMAKE_REQUIRED_LIBRARIES "${_req_libraries}") endif() add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED) + if(HAVE_STDATOMIC_WITH_LIB) +- target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic) ++ target_link_libraries(WrapAtomic::WrapAtomic INTERFACE -latomic) + endif() + + set(WrapAtomic_FOUND 1) diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template index c720e7f51671..96618553b865 100644 --- a/srcpkgs/qt6-base/template +++ b/srcpkgs/qt6-base/template @@ -1,7 +1,7 @@ # Template file for 'qt6-base' pkgname=qt6-base version=6.1.0 -revision=1 +revision=2 wrksrc="qtbase-everywhere-src-${version}" build_style=cmake configure_args="-DINSTALL_DATADIR=share/qt6