From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D7EA115808B for ; Fri, 1 Apr 2022 18:23:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28E63E0878; Fri, 1 Apr 2022 18:23:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0B568E0878 for ; Fri, 1 Apr 2022 18:23:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED955340E76 for ; Fri, 1 Apr 2022 18:23:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 88CA129 for ; Fri, 1 Apr 2022 18:23:50 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1648835869.ebcfd362f1047bbb7c09021bad242dc9fd8a030f.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/files/, dev-qt/qtcore/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch dev-qt/qtcore/qtcore-5.15.3.9999.ebuild X-VCS-Directories: dev-qt/qtcore/ dev-qt/qtcore/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ebcfd362f1047bbb7c09021bad242dc9fd8a030f X-VCS-Branch: master Date: Fri, 1 Apr 2022 18:23:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 93f8dbf8-8575-4be1-b063-fdc3f4c2b514 X-Archives-Hash: e075d1543c70f660b55d3c82adf9be4d commit: ebcfd362f1047bbb7c09021bad242dc9fd8a030f Author: Han Gao gmail com> AuthorDate: Sun Mar 27 13:05:18 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 1 17:57:49 2022 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=ebcfd362 dev-qt/qtcore: use link option -pthread instead of -lpthread Bug: https://bugs.gentoo.org/803470 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Han Gao gmail.com> Closes: https://github.com/gentoo/gentoo/pull/24711 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch | 41 +++++++++++++++++++++++++ dev-qt/qtcore/qtcore-5.15.3.9999.ebuild | 1 + 2 files changed, 42 insertions(+) diff --git a/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch b/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch new file mode 100644 index 00000000..c83c59ac --- /dev/null +++ b/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch @@ -0,0 +1,41 @@ +# Use link option -pthread instead of -lpthread + +# https://github.com/riscv-collab/riscv-gcc/issues/12 use Option 4 +# https://stackoverflow.com/questions/23250863/difference-between-pthread-and-lpthread-while-compiling +# In riscv, "-pthread" equivalent to add link option "--push-state --as-needed -latomic --pop-state" + +diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf +index 544cc227..add969be 100644 +--- a/mkspecs/common/linux.conf ++++ b/mkspecs/common/linux.conf +@@ -33,7 +33,7 @@ QMAKE_LIBS_EGL = -lEGL + QMAKE_LIBS_OPENGL = -lGL + QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 + QMAKE_LIBS_OPENVG = -lOpenVG +-QMAKE_LIBS_THREAD = -lpthread ++QMAKE_LIBS_THREAD = -pthread + QMAKE_LIBS_VULKAN = + + QMAKE_INCDIR_WAYLAND = +diff --git a/src/corelib/configure.json b/src/corelib/configure.json +index 9b5d19d4..da028fb2 100644 +--- a/src/corelib/configure.json ++++ b/src/corelib/configure.json +@@ -355,7 +355,7 @@ + "std::future f = std::async([]() { return 42; });", + "(void)f.get();" + ], +- "qmake": "unix:LIBS += -lpthread" ++ "qmake": "unix:LIBS += -pthread" + } + }, + "cxx11_random": { +@@ -466,7 +466,7 @@ + "shm_open(\"test\", O_RDWR | O_CREAT | O_EXCL, 0666);", + "shm_unlink(\"test\");" + ], +- "qmake": "linux: LIBS += -lpthread -lrt" ++ "qmake": "linux: LIBS += -pthread -lrt" + } + }, + "linkat": { diff --git a/dev-qt/qtcore/qtcore-5.15.3.9999.ebuild b/dev-qt/qtcore/qtcore-5.15.3.9999.ebuild index 3d3b8751..f8c7d657 100644 --- a/dev-qt/qtcore/qtcore-5.15.3.9999.ebuild +++ b/dev-qt/qtcore/qtcore-5.15.3.9999.ebuild @@ -44,6 +44,7 @@ QT5_GENTOO_PRIVATE_CONFIG=( PATCHES=( "${FILESDIR}"/${PN}-5.14.1-cmake-macro-backward-compat.patch # bug 703306 + "${FILESDIR}"/${PN}-5.15.3-pthread.patch # bug 803470 ) pkg_pretend() {