diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-04-06 22:33:41 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-04-06 22:33:41 +0100 |
commit | e68d405c5d712af4387159df07e226217bdda049 (patch) | |
tree | 009ab0f3d427f0813e62930d71802cb054c07e30 /dev-qt/qtcore | |
parent | 401101f9c8077911929d3f2b60a37098460a5d89 (diff) |
gentoo resync : 06.04.2022
Diffstat (limited to 'dev-qt/qtcore')
-rw-r--r-- | dev-qt/qtcore/Manifest | 3 | ||||
-rw-r--r-- | dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch | 41 | ||||
-rw-r--r-- | dev-qt/qtcore/qtcore-5.15.3.ebuild | 4 |
3 files changed, 47 insertions, 1 deletions
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index 1a392d63c644..7b939825c733 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -1,9 +1,10 @@ AUX qtcore-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b AUX qtcore-5.15.1-timezone-1.patch 9484 BLAKE2B aa36362fcc6ea1ab144e97dfa1e023e4fbad64f8702e817ee2431ac271aefd637609d14a265c2d6e58bedbdb3f635b4b979c9bf1463a29370ae05bb2610e131b SHA512 1edfe267827225279b0ecad60a5a350b825ed9bd84574d0e5470e71bac75668c0655aa0db2f001e26e331f85e0cf0a68412ba5a9541581bf39a0e954313672b2 AUX qtcore-5.15.1-timezone-2.patch 1933 BLAKE2B 479f82c90d2132291bc298491d61d7144e08a6db8b36d7d1a89f368c894e41902ae964aaa2819010c485dc5aedd937f2dd00b4efa99d3393d11368e0ea258481 SHA512 c978ffadf15629ab562a53cc24d31e33f4df861962b927ea37061747cb74a7b677d7ae3a617b526c4f48085fe73ebb89fbf5a44748433426dd74e5691a238097 +AUX qtcore-5.15.3-pthread.patch 1570 BLAKE2B f484f7aab89ba92bc33861abc1a4c5fe5f15139a7b14bb6a84a02d8f064dd6465d6ad3ea39ee35cdbb2dae6a2879a824b23068b8e94d3a6ebb2e6639b11a1612 SHA512 492199fdd7f7252c9ec03ed735a015df51e8de7aa2b20b2a4bb391a133e1dd0d88ce9dbafb600071e07abc9b426a9040f64a738361b71dd891186a59087515e4 DIST qtbase-5.15.2-f4ac0b55.tar.gz 67967554 BLAKE2B 3e1ece861c195cdaa688f22cac7bbfdb3cce73ac575f72c8adc916face612307553d98da7b757c44980b1ed0ebf5a9ecaa2e993b41e775f511e32bd515c1ca54 SHA512 6160e02505e4d3f9fbd55f442e0a7a4d906feb576c891600232937bc212660b5c8a41072347d9f78dd0a1ca9357af514b5df2b341e181b2c823b36a912e583fa DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079 EBUILD qtcore-5.15.2-r14.ebuild 2325 BLAKE2B afb40aecf1e4889e4ddb266b6798c926d5485989248f4af3565759956c93a77aad0209a015ccacb5368b0085292029c641720235ea2276849f123d698a933677 SHA512 daba0cc3491ae99ac71aab82f56666dca233c69005d600a69fb4f59b82a7c561dc84fcd8d8ebcaa96bb808488d59343abc7f3b259bb4aecbc86334032e95575a -EBUILD qtcore-5.15.3.ebuild 2156 BLAKE2B aa77419dd1478a4155b336aaa7f106052e0e8b59a7334e91071bfa3a2ff1795e9312ba263138547bb5884528383e8fa297bf434c2aaad40336d80d801f4644db SHA512 556eb4140ae56c4a619746c1b04e554587ed769bf2bf6416c2c93704878fa566881a411f7e39d3e36d954495763c523867b62a4416fa85c50b0cdab02002ab10 +EBUILD qtcore-5.15.3.ebuild 2224 BLAKE2B 6da4ab28e1c869c1ccce63346b4fb7e49359580ce3f04c406534d6c9bc25ff3cef661ae8f7584b08c8a16d0fc15a75bdaaa7abb720a62308d7baadb8540c5c28 SHA512 174a7de2ce42f60199441a2d2689372222b5eefeb304c99c9fd49feb39d2daefb1421fe2e84aec6313bf78f3b20c468f431700b4bcdaf02b8a9d0cbb9bbe2065 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5 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 |