app-emulation/dxvk: Test if the thread model in mingw is posix.

This commit is contained in:
tastytea 2020-04-25 16:03:02 +02:00
parent 80e93ba6a7
commit 9431fbcf8e
Signed by untrusted user: tastytea
GPG Key ID: CFC39497F1B26E07
3 changed files with 16 additions and 10 deletions

View File

@ -5,14 +5,14 @@ AUX 1.6.1-add_compiler_flags.patch 2745 BLAKE2B b664a09dc698c24b0d699b1b717c33fd
AUX 9999-add_compiler_flags.patch 1474 BLAKE2B a38298c55d2884e661afc68d2505cec9718bdc0efcb55a2483bc874208ecbb4cc98c3d0f3a87a381d4c712052ae89479e80fa38b9385e883a525178211c8af28 SHA512 ad1ebb5f68bb88548d7cd774e03ea0d566ea5e7e5bfb1eb2994012cce6ca7ecc1d38a3dd688a3641a60627103142ba9c2d45581b8c358166538d66550fb8c4a0
AUX flags.patch 1400 BLAKE2B c69951eddea7b94836e9d64b39870395c4eb54dcfff31fb9ff9eafa801d989acddcf738802bbc3600a871053546dc5f641726f7e75cfdb9f101973aebd2b3571 SHA512 fd4a053775a4ab7b4df24da38ba602a5e8d43a75676bf3e870a82dd4f4e3bcf228e043139604c95941b09086ecd21887a8eaf81f2229d00abb47fdc83419284c
DIST dxvk-1.6.1.tar.gz 894553 BLAKE2B a45f905f33b255beed65daebbb946b36c28d00dc4d3830e46de342f16d95541361a31243e6ce3e8cde3b2c7297dd2b1044aa61955f1803b8bfb34ec83367c2a9 SHA512 0f3cb7096643d1bcb1db51696824c8ca16720adfe6894392122b21f400cfa416e79eb74cdcc46d1a63a276697d324324d7657afb70b9490e22e6792643fc5805
EBUILD dxvk-1.6.1-r1.ebuild 5260 BLAKE2B d99b30447a7f345a9443502f8c2965471c5aade6b17b2534fa4b3bd31de85ea461c3582671bf2b7da46d34fd35db66858261426667b78eb5f3202af390903570 SHA512 78d286cced1ca42c9769410335b5ba720a760f5d591d05c205d1d879a38a74b4ec06067ef1c89f9886db1807d5aa32c405a0a87a7e3d1d18defb1442ef2a011b
EBUILD dxvk-1.6.1-r1.ebuild 5451 BLAKE2B 384298d2ca80e8057d86f16b91bdf46cb81687d499a8d4570e24b115547e7e936e02118a5e99f760b2e8c81ac0b51939e03fdf8d6fb075f60bce6230c729856f SHA512 a5e495f99a7bc2268bbb60c29869e3cf38b531cc0159fd497aa3779efb6c1ed995d85dea795410cb661afc02141c489d2de520e67f696a60a81d1ec1caa9216f
EBUILD dxvk-1.6.1.ebuild 2970 BLAKE2B 4eb3ed4de391e7bc3aea0b8f2789728f88f43cda7f4da00a6dc7f10308716418bab30c0f235ac4cf048ef887f2100eb4b131be02be0a46817b456a6e05c9db74 SHA512 2915110c781a80e70b1568868c03370804d50954885d7d0015d8bbd5517abcc1ec0bed8cb5f197a3f5d671c6cb5c282ce23fe33c4d179a6ee449b1aaf62ecec7
EBUILD dxvk-9999-r4.ebuild 4758 BLAKE2B 77713cd9832bccbab3cc236ed1c049e098f2e43d9414670841cba88a7b6a00d06ebcf22957d8d2d0a2b64ce88cda107114bbc636ad84733cb3c06f99a2a355b8 SHA512 2cfdefc3af9fdc7e7b3c06d8ae085d031d04c93bdb18146f375fd4de99cacebf377b13e56257340057eac0defa07fa29a68a123ea4972641dafac6507f9869bd
EBUILD dxvk-9999-r4.ebuild 4947 BLAKE2B d0848cd76d63343670416f7ba0d60872e7c3ac20617be556ece1e711ba11a80883238e52b9306c42d0cc290b4372bc2b580ef98755e56a9ff4998c69ae87e6fc SHA512 44d27d864244c70e273aac7094b04179fa181305b7b3afba2b59515d2dd128b073a2f2bb60bb36e14a88ded003eff72f0b0435f93e7eda77e06cdedf86a139fb
MISC metadata.xml 643 BLAKE2B 6e4968ea2dddea57b8079e56f3c7e5f3f478a5d017d4d238d3b2326b593bb461a74ef77270bf659fecec25c564156617e287ab8a247e8b040c07e5b829e70898 SHA512 0c71cc5589839c365703bb1938fd3360adf985875a669239a45abb8f25f517330b8e72895a18db61b076eed7e71e1a804016d0d01afeadc5650340505c30eb74
-----BEGIN PGP SIGNATURE-----
iHUEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXqIHlQAKCRDPw5SX8bJu
B7E4APsGa7zEHKFVOQStuOEfsazJXecTtDnrSjjJMvVQZ8ZivwD/U5Bbm0+2XqsS
ca+FVCE3+xkVEVCcf/f1oO9CN5dH6WU=
=F2BT
iHUEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXqRDSQAKCRDPw5SX8bJu
B0sVAQCBCWT1wgCQCovQQzT5Z71TxObZoOzAUla67aWzsfNfdgD/frcFd9nlQ8qY
KlTh7e0iff61GdYfHCV3JlpOs/LlhRY=
=pQQQ
-----END PGP SIGNATURE-----

View File

@ -60,9 +60,12 @@ pkg_pretend () {
use abi_x86_64 && categories+=("cross-x86_64-w64-mingw32")
use abi_x86_32 && categories+=("cross-i686-w64-mingw32")
local thread_model="$(LC_ALL=C ${cat}-gcc -v 2>&1 \
| grep 'Thread model' | cut -d' ' -f3)"
for cat in ${categories[@]}; do
if ! has_version -b "${cat}/mingw64-runtime[libraries]" ||
! has_version -b "${cat}/gcc"; then
! has_version -b "${cat}/gcc" ||
[[ "${thread_model}" != "posix" ]]; then
eerror "The ${cat} toolchain is not properly installed."
eerror "Make sure to install ${cat}/gcc with EXTRA_ECONF=\"--enable-threads=posix\""
eerror "and ${cat}/mingw64-runtime with USE=\"libraries\"."
@ -80,7 +83,7 @@ pkg_pretend () {
einfo "emerge --oneshot ${cat}/gcc ${cat}/mingw64-runtime"
einfo "Alternatively you can install app-emulation/dxvk-bin from the “guru” repo."
die
die "${cat} toolchain is not properly installed."
fi
done

View File

@ -56,9 +56,12 @@ pkg_pretend () {
use abi_x86_64 && categories+=("cross-x86_64-w64-mingw32")
use abi_x86_32 && categories+=("cross-i686-w64-mingw32")
local thread_model="$(LC_ALL=C ${cat}-gcc -v 2>&1 \
| grep 'Thread model' | cut -d' ' -f3)"
for cat in ${categories[@]}; do
if ! has_version -b "${cat}/mingw64-runtime[libraries]" ||
! has_version -b "${cat}/gcc"; then
! has_version -b "${cat}/gcc" ||
[[ "${thread_model}" != "posix" ]]; then
eerror "The ${cat} toolchain is not properly installed."
eerror "Make sure to install ${cat}/gcc with EXTRA_ECONF=\"--enable-threads=posix\""
eerror "and ${cat}/mingw64-runtime with USE=\"libraries\"."
@ -76,7 +79,7 @@ pkg_pretend () {
einfo "emerge --oneshot ${cat}/gcc ${cat}/mingw64-runtime"
einfo "Alternatively you can install app-emulation/dxvk-bin from the “guru” repo."
die
die "${cat} toolchain is not properly installed."
fi
done