app-emulation/dxvk: Test for mingw64-runtime[libraries].
continuous-integration/drone/push Build is passing Details

And made the error message (hopefully) clearer.

Closes: #7
This commit is contained in:
tastytea 2020-04-22 15:38:13 +02:00
parent aba7657552
commit 6c98bb9c64
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
3 changed files with 20 additions and 12 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 4925 BLAKE2B e1589d6a8df377d8be08f100bc02f150c2636f8c558d0b1846ec943a022827dd35fc77193715ce361b339f56b3a5eb57372a67f363e2399d3d6a643eb2871ac3 SHA512 a07b7e6791b3b29f836f4ef3863e78aeeae8bc074dedf37fbc0ddb432fc8b83bd51bddf70521d521c262918b2ca30cb62f082d23ebab1320ff00fafcc8fd168c
EBUILD dxvk-1.6.1-r1.ebuild 5250 BLAKE2B 84b3f37fad4613fe7c19588969b2433abbae9bdeb2693e84de602126752b8b901d850fefb406f109b08fe8e9cbca6de48199401f808c092a481fdd926513f905 SHA512 3f6155d3d6baffbd5cdcd0bc7356a34bc6420dc56440033255b3fb5d346b645c69be128936c5951c0308ecd8ae86abd785efe6c7880a153f4766fa4f7e7b8d8d
EBUILD dxvk-1.6.1.ebuild 2970 BLAKE2B 4eb3ed4de391e7bc3aea0b8f2789728f88f43cda7f4da00a6dc7f10308716418bab30c0f235ac4cf048ef887f2100eb4b131be02be0a46817b456a6e05c9db74 SHA512 2915110c781a80e70b1568868c03370804d50954885d7d0015d8bbd5517abcc1ec0bed8cb5f197a3f5d671c6cb5c282ce23fe33c4d179a6ee449b1aaf62ecec7
EBUILD dxvk-9999-r4.ebuild 4518 BLAKE2B 8e78b48079cb2d3e19e0a2e4596663ac3afb02ca6d169906490d60a203effc0543714ba89e80fb4ad8e3a2140a1a32c1b91ff598b77044c41b250599d4520cc4 SHA512 49e1e05ccb52da77ea93e5282d542414674fe416b4643fccdf328811c96f3918debf7814c0362f3d6845d2ded39b14aef9b7246255af93dc74367797593b2512
EBUILD dxvk-9999-r4.ebuild 4748 BLAKE2B c5a0165c76d32c856217bdbb81a62fe5613dcf790e854c9132a86141e5aae1ee85e5ad0d3af340429d269f8436416fc67f211f34be099e75c8d3cd4e368dc9db SHA512 7c5fd5b11a0a77a27f54549de8bd4c5e7ea32a100ca7bcf90b2b134a750b9eb0a7b56f6cfa6fe4825cbbee383962f73e6434b1a2b7e666d0867cc7d3c146d16d
MISC metadata.xml 643 BLAKE2B 0b5aa604f15a049ffce213c45e4731da24bc903d54dfce84692be92f106a271fde885ada19f5a44781452423178b1361e9fe2152cc4c689dbd4fe8e04f241ade SHA512 49f429099195f87d22cf8a5a549074b881aed6b7ff1f76427497f730137d002ee3d8b0a6d1cf4322588e8d3a4d61d9387d72e668eab8b9fa2e0cebb17f942802
-----BEGIN PGP SIGNATURE-----
iHUEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXp97ZQAKCRDPw5SX8bJu
B+vrAP98TxO2qHIfxZVPdk8OLDMvlm2meIAQVBmQuYLSsp8FMQEAjB9xlfvAF1bX
UsVNstlQQM1Z4x9FatN647pqVAtwYHg=
=yT3u
iHUEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXqBklgAKCRDPw5SX8bJu
ByXEAP45aCTdEEuLawTO0x9oJimfsR8IYnCPK5HHPNGuhDPGAwD/UVb/i0TQQIUC
Vcc9armo8sHylIFtfbTPLImsSHv5bSM=
=PLak
-----END PGP SIGNATURE-----

View File

@ -61,9 +61,12 @@ pkg_pretend () {
use abi_x86_32 && categories+=("cross-i686-w64-mingw32")
for cat in ${categories[@]}; do
if ! has_version -b "${cat}/gcc"; then
eerror "${cat}/gcc is not installed."
elog "See <https://wiki.gentoo.org/wiki/Mingw> on how to install it."
if ! has_version -b "${cat}/mingw64-runtime[libraries]" ||
! has_version -b "${cat}/gcc"; 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\"."
elog "See <https://wiki.gentoo.org/wiki/Mingw> for more information."
einfo "In short:"
einfo "echo '~${cat}/mingw64-runtime-7.0.0 ~amd64' >> \\"
einfo " /etc/portage/package.accept_keywords/mingw"
@ -75,6 +78,8 @@ pkg_pretend () {
einfo "echo '${cat}/mingw64-runtime libraries' >> \\"
einfo " /etc/portage/package.use/mingw"
einfo "emerge --oneshot ${cat}/gcc ${cat}/mingw64-runtime"
einfo "Alternatively you can install app-emulation/dxvk-bin from the “guru” repo."
die
fi
done

View File

@ -57,9 +57,12 @@ pkg_pretend () {
use abi_x86_32 && categories+=("cross-i686-w64-mingw32")
for cat in ${categories[@]}; do
if ! has_version -b "${cat}/gcc"; then
eerror "${cat}/gcc is not installed."
elog "See <https://wiki.gentoo.org/wiki/Mingw> on how to install it."
if ! has_version -b "${cat}/mingw64-runtime[libraries]" ||
! has_version -b "${cat}/gcc"; 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\"."
elog "See <https://wiki.gentoo.org/wiki/Mingw> for more information."
einfo "In short:"
einfo "echo '~${cat}/mingw64-runtime-7.0.0 ~amd64' >> \\"
einfo " /etc/portage/package.accept_keywords/mingw"