commit: 3884552b6dd1bdeea1ca82bd23b6736c519ebe90 Author: Han Gao <rabenda.cn <AT> gmail <DOT> com> AuthorDate: Sun Mar 27 13:05:18 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Mar 30 18:56:21 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3884552b
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 <rabenda.cn <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/24711 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch | 41 +++++++++++++++++++++++++ dev-qt/qtcore/qtcore-5.15.3.ebuild | 4 +++ 2 files changed, 45 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 000000000000..c83c59ac3113 --- /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<int> 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.ebuild b/dev-qt/qtcore/qtcore-5.15.3.ebuild index 156e4f73b725..8e924cdfabd0 100644 --- a/dev-qt/qtcore/qtcore-5.15.3.ebuild +++ b/dev-qt/qtcore/qtcore-5.15.3.ebuild @@ -43,6 +43,10 @@ QT5_GENTOO_PRIVATE_CONFIG=( !:xml ) +PATCHES=( + "${FILESDIR}"/${PN}-5.15.3-pthread.patch # bug 803470 +) + pkg_pretend() { use kernel_linux || return get_running_version
