* [PR PATCH] qt6-base: fix QMAKE_LIBS_LIBATOMIC for armv6
@ 2021-05-29 9:35 sgn
2021-05-29 12:50 ` Johnnynator
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: sgn @ 2021-05-29 9:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 416 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages qt6-base-libatomic
https://github.com/void-linux/void-packages/pull/31200
qt6-base: fix QMAKE_LIBS_LIBATOMIC for armv6
Required for #31092
Re-building all packages depends on qt6-base to check, now.
A patch file from https://github.com/void-linux/void-packages/pull/31200.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-base-libatomic-31200.patch --]
[-- Type: text/x-diff, Size: 2547 bytes --]
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?=
<congdanhqx@gmail.com>
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: qt6-base: fix QMAKE_LIBS_LIBATOMIC for armv6
2021-05-29 9:35 [PR PATCH] qt6-base: fix QMAKE_LIBS_LIBATOMIC for armv6 sgn
@ 2021-05-29 12:50 ` Johnnynator
2021-05-29 16:30 ` [PR PATCH] [Updated] " sgn
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Johnnynator @ 2021-05-29 12:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 344 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/31200#issuecomment-850828307
Comment:
Can you add this as a sperate patch?
The patch you are changing is already upstream and will be in the release this Monday.
Also I think find_library might be more appropiate/correct than using '-l'
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] qt6-base: fix QMAKE_LIBS_LIBATOMIC for armv6
2021-05-29 9:35 [PR PATCH] qt6-base: fix QMAKE_LIBS_LIBATOMIC for armv6 sgn
2021-05-29 12:50 ` Johnnynator
@ 2021-05-29 16:30 ` sgn
2021-05-30 17:13 ` sgn
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2021-05-29 16:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 421 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages qt6-base-libatomic
https://github.com/void-linux/void-packages/pull/31200
qt6-base: fix QMAKE_LIBS_LIBATOMIC for armv6
Required for #31092
Re-building all packages depends on qt6-base to check, now.
A patch file from https://github.com/void-linux/void-packages/pull/31200.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-base-libatomic-31200.patch --]
[-- Type: text/x-diff, Size: 2365 bytes --]
From d814ecea9ebf94b2e535198383b3cc973f19b520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
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".
---
srcpkgs/qt6-base/patches/libatomic.patch | 14 ++++++++++++++
srcpkgs/qt6-base/template | 4 ++--
2 files changed, 16 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/qt6-base/patches/libatomic.patch
diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
new file mode 100644
index 000000000000..edbe5e609d5a
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/libatomic.patch
@@ -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)
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index c720e7f51671..d03dfe7a2129 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
@@ -25,7 +25,7 @@ makedepends="zlib-devel libzstd-devel dbus-devel
sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader"
short_desc="Cross-platform application and UI framework (QT6)"
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"
distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtbase-everywhere-src-${version}.tar.xz"
checksum=f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] qt6-base: fix QMAKE_LIBS_LIBATOMIC for armv6
2021-05-29 9:35 [PR PATCH] qt6-base: fix QMAKE_LIBS_LIBATOMIC for armv6 sgn
2021-05-29 12:50 ` Johnnynator
2021-05-29 16:30 ` [PR PATCH] [Updated] " sgn
@ 2021-05-30 17:13 ` sgn
2021-05-31 10:49 ` sgn
2021-06-02 14:51 ` [PR PATCH] [Merged]: " sgn
4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2021-05-30 17:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 421 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages qt6-base-libatomic
https://github.com/void-linux/void-packages/pull/31200
qt6-base: fix QMAKE_LIBS_LIBATOMIC for armv6
Required for #31092
Re-building all packages depends on qt6-base to check, now.
A patch file from https://github.com/void-linux/void-packages/pull/31200.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-base-libatomic-31200.patch --]
[-- Type: text/x-diff, Size: 2365 bytes --]
From 4f1044b82ffcb9b826625aa11b0dbfb146b03871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
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".
---
srcpkgs/qt6-base/patches/libatomic.patch | 14 ++++++++++++++
srcpkgs/qt6-base/template | 4 ++--
2 files changed, 16 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/qt6-base/patches/libatomic.patch
diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
new file mode 100644
index 000000000000..edbe5e609d5a
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/libatomic.patch
@@ -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)
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index c720e7f51671..d03dfe7a2129 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
@@ -25,7 +25,7 @@ makedepends="zlib-devel libzstd-devel dbus-devel
sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader"
short_desc="Cross-platform application and UI framework (QT6)"
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"
distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtbase-everywhere-src-${version}.tar.xz"
checksum=f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: qt6-base: fix QMAKE_LIBS_LIBATOMIC for armv6
2021-05-29 9:35 [PR PATCH] qt6-base: fix QMAKE_LIBS_LIBATOMIC for armv6 sgn
` (2 preceding siblings ...)
2021-05-30 17:13 ` sgn
@ 2021-05-31 10:49 ` sgn
2021-06-02 14:51 ` [PR PATCH] [Merged]: " sgn
4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2021-05-31 10:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 268 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/31200#issuecomment-851403154
Comment:
All rebuild has been done. @Johnnynator Do you prefer postponing this until new release of Qt6? The other PR is not urgent, anyway.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: qt6-base: fix QMAKE_LIBS_LIBATOMIC for armv6
2021-05-29 9:35 [PR PATCH] qt6-base: fix QMAKE_LIBS_LIBATOMIC for armv6 sgn
` (3 preceding siblings ...)
2021-05-31 10:49 ` sgn
@ 2021-06-02 14:51 ` sgn
4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2021-06-02 14:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 262 bytes --]
There's a merged pull request on the void-packages repository
qt6-base: fix QMAKE_LIBS_LIBATOMIC for armv6
https://github.com/void-linux/void-packages/pull/31200
Description:
Required for #31092
Re-building all packages depends on qt6-base to check, now.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-06-02 14:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-29 9:35 [PR PATCH] qt6-base: fix QMAKE_LIBS_LIBATOMIC for armv6 sgn
2021-05-29 12:50 ` Johnnynator
2021-05-29 16:30 ` [PR PATCH] [Updated] " sgn
2021-05-30 17:13 ` sgn
2021-05-31 10:49 ` sgn
2021-06-02 14:51 ` [PR PATCH] [Merged]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).