diff options
Diffstat (limited to 'dev-lang/ghc')
| -rw-r--r-- | dev-lang/ghc/Manifest | 21 | ||||
| -rw-r--r-- | dev-lang/ghc/files/ghc-7.0.4-CHOST-prefix.patch | 17 | ||||
| -rw-r--r-- | dev-lang/ghc/files/ghc-7.8.3-prim-lm.patch | 12 | ||||
| -rw-r--r-- | dev-lang/ghc/files/ghc-8.10.5-modorigin-verbose-conflict.patch | 20 | ||||
| -rw-r--r-- | dev-lang/ghc/files/ghc-8.10.6-aclocal.patch | 26 | ||||
| -rw-r--r-- | dev-lang/ghc/files/ghc-8.2.1-darwin.patch | 31 | ||||
| -rw-r--r-- | dev-lang/ghc/files/ghc-8.2.1_rc1-hp2ps-cross.patch | 104 | ||||
| -rw-r--r-- | dev-lang/ghc/files/ghc-8.8.1-revert-CPP.patch | 52 | ||||
| -rw-r--r-- | dev-lang/ghc/ghc-8.10.6-r3.ebuild | 869 | ||||
| -rw-r--r-- | dev-lang/ghc/ghc-9.0.2-r3.ebuild | 898 | ||||
| -rw-r--r-- | dev-lang/ghc/ghc-9.0.2-r4.ebuild | 27 |
11 files changed, 23 insertions, 2054 deletions
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest index 468797b82206..a6f5615dda70 100644 --- a/dev-lang/ghc/Manifest +++ b/dev-lang/ghc/Manifest @@ -1,12 +1,5 @@ -AUX ghc-7.0.4-CHOST-prefix.patch 276 BLAKE2B 77c706d291928a229edad6bcde37786b2c11cf52f42b22f44d3bbb7cfe12f83b8725cae020f95994e0f12022989b125d1f1e6f43ad0cc6698452264b8634651c SHA512 9d5d30b95c0467bb77f320c82458be5eaace5bbd77684725b9f3fd70d9640accdd771e36aa957c66f9bfb01e45088d32a5f811444b472058574ccbf89e10efbb -AUX ghc-7.8.3-prim-lm.patch 444 BLAKE2B a930bb9657441a48941debf79711e06223c5680df0f60d7d972e0150950109bf8f8a99c35c7dbcda21172dddcb15d8a379085813e44647583e3888f27f597568 SHA512 6979e002589a54c870c70eee8357dad4feb55b4e5102350cc09a466145677dacaa1bab5ebe4818cf0d3cd8ab50ee0ec2ab642ab0fb3fd34f4a266e5e90f9f389 AUX ghc-8.10.1-allow-cross-bootstrap.patch 541 BLAKE2B b77b3c9ebb7a33af6f82ec1b9927664e9bfce04450560a8e436ffa87feca50d606824192b7333e3b98d5552622592b6d39d0b184037ce646d6f7ebd205deb348 SHA512 d87a99ac96846e161d8c939079f8314d380be8e1dc62f956e3afcce1339a76447a14002b30bac1c86c807fd8eba23a0648912a3d074248f3513f9aadacd27489 -AUX ghc-8.10.5-modorigin-verbose-conflict.patch 956 BLAKE2B 8ce1e156c92d0d931930a4ad366f62be184be46beb1f25b92ad97be03d47c9702313be758c33a17c40002816a26e70f4017e4e02325f1513864086e50ac6136b SHA512 27f884e8b4e6250cbd2620a190531ae72693518da8cb56e736fe58bc436fca67ba9eb8d3fa89fcd0234858a8533ca3e15d5b0c20ed1953fba56736000fc8a732 -AUX ghc-8.10.6-aclocal.patch 699 BLAKE2B 363b46ccd0c116aef0d0be29010cee13a5f8b56e0bb0a5834e790db4a9bc82250466b2214f17634f8cb0e01d5e877f1ae6fd6c900b020c421e2daa6c614b8be7 SHA512 733ff5cbdd55c7ae6c5bfcc80eb30456f372c0338671e65bf7fe99cc741b2776b9e7e21d3926c3259e7484678e98bbbf05e2b22aa8a339dd8028195c9489cce4 -AUX ghc-8.2.1-darwin.patch 910 BLAKE2B 2f1a44dd7ead59301b5dd59c8cab932710655416640f2c8d5273cf07da4a45bf702d840768e2d32822e89f1b07cc9ed3a6110e1847e11468fca5c515e9e26f70 SHA512 0177fda8717d9158a99d96853feb1bf40ff13df8f5c5669c7c48f33accf69d6ddb05876776cda66705e85ee56c5ecff8f81722d8e748b6c2ed6b9bf611e42a2c -AUX ghc-8.2.1_rc1-hp2ps-cross.patch 3865 BLAKE2B d68b1e15c091047d086be780dc0bb5ce2a1b713244ee240ae045052ccac947baf6a5bdea8cad50d0fac2984700069af7dcd320b96ca09af8c7b81021329da41c SHA512 d2ed48701216f5c03567e61c207e32d6218009380941275c690edd8eb0197728e7e3c0edb00d512792dc2041a958de82ceef393e96d3324b690157162e28d29a AUX ghc-8.2.1_rc1-win32-cross-2-hack.patch 6231 BLAKE2B 8ad4428ebe9a373e08e94e5373ad9578cafdf95b866ced2a4000434d9e5d4298b129e832e13e8e175e8977b9dda9351d01a896e2c320a1a40551d5892b0efc33 SHA512 8617c1346ba7aa2b41ee01feaa47f2ca477353f9b825be48c5d3505a134e0a80b613efc6cb92e7fbd3fe062e77450e197c826151a42c0c77177fc6ef8e65287f -AUX ghc-8.8.1-revert-CPP.patch 2236 BLAKE2B f793a9e9516f9f484234311372715116dfdd588a6682113914c17feedc635371779f0c0591e1f0caf3ff3e5ca5d4c7cc8b052045306f3df4085873d0df25f2af SHA512 b324c6873a802e20ee690f0574f9f2f312f3ba4331345504b7170f52ab2b1adeb9d047a0e5526053d006d67fc261e771a284bdb8f7b76653c21d9bf9337d7cf5 AUX ghc-9.0.2-CHOST-prefix.patch 282 BLAKE2B e0a2505c2ae91d5aad41fa3faf4fa7ece8ebcf0677377b76ff16ceea648eb4fde4f198a94574649d5cd7aeaa7d70ad4ea93a2636ba5868c470d2f47209a1065d SHA512 ce17006d5635ba24576bf80b3aabce9eb132ff65d820e22fd430178d3abf8536d3696b72d226384d1c42d9a6969fdcee5a05b260d55015c250fb72c45a1708e5 AUX ghc-9.0.2-darwin.patch 916 BLAKE2B ece65347ee4d40ce729642766273792c5f619c5f2788366f5f1e1784d630efadf59fa1c1e2e03dbd81633ad4202c81fc39a6c94472db52af2f99362ee1e67093 SHA512 300167a4c5c4b4bf6b18cdce242c8e27def88f4f3d810da0e5b60bdb77a186975716c2ac2ced8365e2f6a17b799e77eba8b3b77ae4b9efe69339dec48e78963a AUX ghc-9.0.2-disable-unboxed-arrays.patch 1298 BLAKE2B d3d8cf5b8f7f012cb93f6481822348c68e7ff79896664f51de5e4b248f8de68ea04144791bf8959b83ea265f384c055100fc27caf0da17f9a5a173c333928c4b SHA512 cc979c2fdb877716dee3fb75d9ee0734737f2f9a5611a0a1d20e2d603b48ebeaa339d09a130a79fce45eebe659a3741cf862b17eafecf814f408399139250806 @@ -18,27 +11,15 @@ AUX ghc-9.0.2-modorigin-semigroup.patch 1210 BLAKE2B e29917dd740bded98257366ca37 AUX ghc-9.0.2-sphinx-6.patch 1560 BLAKE2B 60cf463ecd2b0b3677b6f9b171c2b71b59d31d563c70461ed96b276bd831ca722419ad802a6c58851c3cc83eb4e229bbb53dee02e227c41751985834597b08a4 SHA512 89ed630b3d35d4f6fe73e66ff622c63bac35688cdcae4b82e8ff1c1bc069df0897d0744dec9f57a386ca07b8b1fcbdc38b8ad7773f8629718473479afd61eec0 AUX ghc-bash-completion 6496 BLAKE2B dc94a1979e886026a2fbe04bf7b45718ffa3e025a0e8945262e21a1243bfce6517fa1794f2ba6cd54cc853e93ad5d80472b9019b95762f10b5be83634a479955 SHA512 ede79ccf23555f60f48297d29bd98e3ccfd67d2cf27462153e00beb930398cb497e34ba8316e91df44c577ed11fdbe5606f7c6a2777e35d5e783590e49ccfeb5 AUX latomic-subword 2886 BLAKE2B 97c6fb8d055e2ae4abf366f9f0e255588ca2f61f189d9356c5d0e6ff0dd7e7f10676469c72c02d1bd1bc10e5329bc31056670d2ddf03d6e65ae3ff1a5b4cb561 SHA512 8e7e261211ce4cc9baf855ca7b9a289b07fdda27b9738434c42374f9381429fa5798fd15f9cfeb50cc17839a8b8d3634653b72dc8ae9bb5970cf88d35553516c -DIST ghc-8.10.6-src.tar.xz 19932832 BLAKE2B f5d0c43aa5df87648e32beeb5ed6866b231cbce4f344fb03110db826b36bbac435f5e89d9ffeef3f87c15e830fdee6b95150b7bdcd06906575bfcd9c83797dff SHA512 6314eb9744d47d803b30b621bd12bf6179dad5cc578ec267b3a65b89e9c9b431bdb4913936f040c7ca4fcc71a676a43e78b5f6173d123a844e7f29004405b8b6 -DIST ghc-8.10.6-testsuite.tar.xz 2265044 BLAKE2B 72a1e955acecc92a720ee2747d96cacf56f2968c9deabb254c882a969c154baa0fdb639a857844ec91a4e47ee553dd13b58c3b790202e7e73500095c1ec85ee9 SHA512 f74d743bd8f889c2941be8fd5348e92abcaf75bce48140f7f9cc0c6ce33ba24a8479bef48631ffe2a10397c0ecf166b3bddb6ca8ee905859c029175de5d43f2a DIST ghc-9.0.2-riscv64-llvm.patch.xz 7148 BLAKE2B 01a0d4036b649f663aebebab06990ac041533e7462d3ee9e143444f1119b736f2f8f2dfc293d61da1fac9f0d3ef12e98bab5b0c9fe8440ed1eab22a1d45fb9d7 SHA512 8afb62d5363d8a1a8f63e85335f3c8fa35b7d22899ebe334218a60ce9519852325c8ce93bb0be794c36cbc3c1cc031b7b1e2f4d7665d71f49e95f737bd91ba1a DIST ghc-9.0.2-src.tar.xz 27270396 BLAKE2B 0a73d910d3ef11161f895849025fe37ce231932f7cde441fdf620cf8c51678060a804467879eb0ee5c0a30413604c56e28e2aa1cde01e45c620b76987d9c0c0e SHA512 32994c7d2b8f47bae604cd825bfcf9c788d79ce26d1d5f58bd73a7093e11ae6c3c17b31dc0c9e454dbf67ca169b942f92213c388d615768cae86055bf6094dee DIST ghc-9.0.2-testsuite.tar.xz 2403564 BLAKE2B 0e7f6fefb9c972f94073aca8b15147913ffa8d3cd3ff7fc63ef7e20b4efd8b443cf21f12e1ab0f5044790f6d8af6cf7788bda85a21b2f356ddface86eb896670 SHA512 b2375500ae837d74af8085d099899b5a7a589c59bdcc033ca0bd6e00f33c4f8d90b481e0c7c3de113e607fcfafdfe8edde4713e6d242b2d4ee87df2eb960c9c7 -DIST ghc-bin-8.10.6-r3-i686-pc-linux-gnu.gpkg.tar 73062400 BLAKE2B c0701c16434ae5918f5ec1c55ab06aa036b98947f0f68c58aaa59b2a23ebb408f60f1886c76271351f2e99a334d6e1feeb47b6c4c14c09040b197eebbbcf3142 SHA512 d75bb6d06d32a5f60b020e9d8d77485ea8c391fd88a4583d0ddfd33a0e75506dc23b736fa6a15da25116c6c90c53b2d75dae38935581c5145d5b247d3c19f2a6 -DIST ghc-bin-8.10.6-r3-x86_64-pc-linux-gnu.gpkg.tar 123996160 BLAKE2B 3279a3f312225cae30196467b6f61b749f8ea037b2b65adaafdea1668c81a5ed402bd3acedc02aaee371a6d27c3c01c0f4c837bb9058a0ed8b61715afab5ccc9 SHA512 ea24551137b5057a2c29e0bd9a22ce247669dc38bcebac7ff3bac746b1fc9bd46b1fe2d894fd862745bb97af0d92be2a0563c18fc29e7565c5506552edb0c3e1 -DIST ghc-bin-9.0.2-aarch64-unknown-linux-gnu.tar.gz 304621314 BLAKE2B d38b8571d41b5703da6b29f43664293761865166a7e3ab6b9c4b039f1af15faa4aa2013a32eb00059d6e595984895762eadff7b62141157d2dea6eb9b035138d SHA512 94e0e00329a18b494b509b3f8190cf6fed2399a2ac2d2d96fdfd90bf5dbeb8db68b6759f719ad85f8873961b0e983ff0006ce0bf109e96462169cbd9fa7b6784 -DIST ghc-bin-9.0.2-i686-pc-linux-gnu.tbz2 123509908 BLAKE2B 45614984803a7bfa266f99d4adb4b5f2ab7b9e5e89c6ecd501296fc99a1d96e798ccb9c832f8dcb15fff9725beb918a7b63e62ff13f59b6506a2ef17930c45d2 SHA512 e0b7f4474c16f0763a2f787027fbdfeb3125b48c987fa1196bc189fefad9f0bfa2806da62af46d61ca911f5275b578076e2b326acf39e0894a8daa9deda0843a -DIST ghc-bin-9.0.2-powerpc64-unknown-linux-gnu.tar.gz 235636284 BLAKE2B 878ac300cca5d2cbc5cb21dbb347da755b4027cbf63ec77464740854fa8010569de5e03acef67cd877da13665c906b2fd04e24e226e9eb39b57ba979093c732b SHA512 28f096e965abdac9cc370c882639f10285b9073ba5332f7af215eccff948e41c01c3d6bb3bc8e3b4e809e12867a95b49f82dd76e0090b974088f75ab9d1bc199 -DIST ghc-bin-9.0.2-powerpc64le-unknown-linux-gnu.tar.gz 275226316 BLAKE2B 10ade2359432b0ede7431ee543f0ff47f4b203465d81719da579ad63ca467359eb9fcf7336a12feb6ff75a480f349576ff8ea1b4ebe1094fff228ae4fd00d6e0 SHA512 64b4c84d149358b8d3a6cb29a6d3a75af11e7b14e6d910c9789c9949262e4ed2a17f8a0d1e5dd297121957061fe2395d6f43acae6b4ab28851e3cd414cd9c89c DIST ghc-bin-9.0.2-r4-aarch64-unknown-linux-gnu.tar.gz 221699967 BLAKE2B c6e34b23a9664b6dc7d13f939063c34665c558b2596e3446abd9a8f90e9ad586f515e1703c36d269f7fb4a36a85f497e9f4d356f01ede7a7a614b3cd4fbf0dbe SHA512 d9f381b417ee740c9bba9508d5ccca2a6bffdd32c6262d76f254a21cf7505d2aaa5695c0354ee9e8fb672b90ae67af6205cdd2fe6ad6aa5d610c760d59392b62 DIST ghc-bin-9.0.2-r4-i686-pc-linux-gnu.gpkg.tar 81059840 BLAKE2B 655405cd402cc7af424baf5b715f64af3ce97d474c883c618cd8e6fae40274dc6f584872c607cbe3553141a199729df98ddbdb5947a50520b67f53946f20d25a SHA512 401ab9ae646e18519ba1b06705944862d3f802068c4eae19fc019899eb14ceef95fa57e51b5527e5c5314c2433aff7e418e1d35c2de425c142c34e8fa21a5f46 DIST ghc-bin-9.0.2-r4-powerpc64-unknown-linux-gnu.tar.gz 233834058 BLAKE2B 32ee779c4567472799f985102cdf0a6a5dfb3984795b6efafe6a6326933e1d0128260012cbe5e0e20c71becd4d2e589e32f43882e66b479ef4c34358d7bd8e93 SHA512 be56a92c2f5f00f1f0b22f02745d836ac3706fc207932c71277c1076515ed4fd1875372844b4cbb0996afec5fc122255103ac03c65c99d087615005f1aa63732 DIST ghc-bin-9.0.2-r4-powerpc64le-unknown-linux-gnu.tar.gz 210668658 BLAKE2B fe33a43ea38e5fe17a003e60f29458f0dc5115f92db311dff11b2ce3fa1a9fc0304ad93c76535fb8e4ce44bb703f8a18638149f36b076c84f5c44385486722bd SHA512 12e04c29873ddd80ff259998121b3ce4b9dcdd1157cbb38ce8ac0234c6aaa0c156b0cc78f95af86288e6f595f9e010a1db88ba737e27773b404ed6129e58044f DIST ghc-bin-9.0.2-r4-riscv64-unknown-linux-gnu.tar.gz 315182159 BLAKE2B 95ee2f82eb706b42a0a3303038cf28166ac1e766a5f38402f833830c311f02773881b5341d6d7a1772fdc616522b1448a740caf34e4e534b5d00fedeb23604de SHA512 dd143f8b379e8ca04ab6254aa19978a3a8caf61322e2e3b2bae7488025949845aa5d5fc0e3124ff360172c2b47e4a33df4d1d55c8a976c96b552cd3c930b2fad DIST ghc-bin-9.0.2-r4-x86_64-pc-linux-gnu.gpkg.tar 123955200 BLAKE2B b1f45eea658f496997e63c21e3ef190749c122ee3a058d5f25fd90a2e2c33841817c540b9bf87e27e6981d9fb28d9201454217fa8ba9c1d9fc4ccf3d20652158 SHA512 06a240f7117f30179073e075634510d9ffe880010de16c93a001dce7b3020666b0b26d51c2c08cdaee7fc6513d9ffc7082f20b233d62b9149419abba2b4bd4ee -DIST ghc-bin-9.0.2-riscv64-unknown-linux-gnu.tar.gz 313475807 BLAKE2B a5e1bbd4630eaff63dd01d79fdcb26a663771c0241d3211aa3a0033cb58addbe8e696177500ac06ae727fc645bfc6f16a3df763a6a0ae039b8823bcbfb9918bb SHA512 5e462f6f9d3f3507b3e09230729faa2a3e1fa92a8024fac602d75b804fff25f27e335871658f4b7b2c671f9e066373ca0285720da315a6c22f6f2c9c3cfea927 -DIST ghc-bin-9.0.2-x86_64-pc-linux-gnu-r1.tbz2 121347519 BLAKE2B 6bd41cdb8ba1661735e46df4709888e6461cff969678716c82681a0a0b0e8d0a32532a070f52efb0ab99ca126207998e8883d01902071e797a7a0f19881d5925 SHA512 c7de43577fd97e6fbde7bbffba4e1d2b83cdda405cff46f95c9eff23260542b426091d8dba75605d81ed41740a793a409e7448538e5adc7a391a901f20e8f2e4 DIST process-1.6.16.0.tar.gz 87354 BLAKE2B 8c2977d6801faef8825ed35f058a6207a518f72eb87ac3144f630bc028f4753cefb9ed4d3fc29185438bcb4f38d33f5a45aebec6a8101e4cdc1b3570ada2e5dc SHA512 1663f2746a05a5a4c29d249db54eaa49edbbadfe8d189eab02276c3f6f3d6b84c81cc4333318c42c7a7265638402cb13276f08aeea134a7f5dd98da050a34341 -EBUILD ghc-8.10.6-r3.ebuild 28782 BLAKE2B 3c0e4f055b3027997d794defa77a77238eebf83bdf1bda9e42c7706695cdef7430677da5af1effd08a3ffd698883e88ab23e698cd9ecfe39d68cf4e47389dac9 SHA512 987cbdd685e1d270e5e1c8d23763786657f599ac52a7657504a863585e4db6f4306fb79c0a05d0b862819ee8d86c8441fa000d656bfda534808e6752a0499ae2 -EBUILD ghc-9.0.2-r3.ebuild 29855 BLAKE2B c4cd2106feea66cf91a8d147081cb112d852ec594d7fa21858517bd560f37a79544418fb8d5875198488976034fbc60084aad293d2604f4f31812c05e73c7900 SHA512 a481c60619e275934c15f4ef7b3f061d613c832e5cdb42bbcefeb4924e70455747ebc3e0845c1573dc7beee0cc60a93c863de2f6e25d73371cd270ee0c1273cf -EBUILD ghc-9.0.2-r4.ebuild 30133 BLAKE2B 66ea83d36401b63d13eee8e937b5657ad7439e24d373994383e3a2632ddc274bc4334f32626ee924adfa60fcf721392fa7c0e53bcf9cdf5cdd6e954915471dcd SHA512 9ad75567d39b990ab0d4a5618cca1aecb096e2b21a161a8d22b2662dd040c4cbe97da36f78b7a1054560546a85accfd77be018db90730b61d3af35b867caf8ca +EBUILD ghc-9.0.2-r4.ebuild 30923 BLAKE2B 3c14d5e3911bb7c2dc23bc8759b55b6131a486ace796eaa7695f60eb8b31dd61334c5ee8f616e2ecb67f114becfb9126b547d251a7d7695161e88321b9c12c28 SHA512 b74b690bf17e7ed765ec606771f967ac62f93311b380ad602f52fdae18c2ebc7b88f2a7b8186d32ca9e74f39f025ae4764b5e5ddd7b2e240f69f16660648cdc2 MISC metadata.xml 1172 BLAKE2B 88b5e4af0e8c0e3335185f2c5469837a43ee87e6fc598242f29aced9bb8a3c330139978c564eb4ca503101934917e8406e9400dffd2eeaf7cd9983e8dc96105e SHA512 b03bb932efa54be0d55be591850064fcc967c8d77afdded255be91794544d47bdbbbd2959103cb739f6ec57b8571a955352e965ee1540a9854235a963b218bd3 diff --git a/dev-lang/ghc/files/ghc-7.0.4-CHOST-prefix.patch b/dev-lang/ghc/files/ghc-7.0.4-CHOST-prefix.patch deleted file mode 100644 index e38d9165e065..000000000000 --- a/dev-lang/ghc/files/ghc-7.0.4-CHOST-prefix.patch +++ /dev/null @@ -1,17 +0,0 @@ -Strip versioning components from *HOST for Darwin and Solaris - ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -1358,6 +1358,12 @@ - freebsd*) - $2="freebsd" - ;; -+ darwin*) -+ $2="darwin" -+ ;; -+ solaris2.*) -+ $2="solaris2" -+ ;; - *) - echo "Unknown OS $1" - exit 1 diff --git a/dev-lang/ghc/files/ghc-7.8.3-prim-lm.patch b/dev-lang/ghc/files/ghc-7.8.3-prim-lm.patch deleted file mode 100644 index 3ef2313fcec1..000000000000 --- a/dev-lang/ghc/files/ghc-7.8.3-prim-lm.patch +++ /dev/null @@ -1,12 +0,0 @@ -Fix underlinking on ghc-prim. -Fixes ghc-stage2 crahs on hardened toolchain. -Reported-by: aranea -diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal -index ffb32af..0431380 100644 ---- a/libraries/ghc-prim/ghc-prim.cabal -+++ b/libraries/ghc-prim/ghc-prim.cabal -@@ -68,0 +68,4 @@ Library -+ -+ -- ghc 'sin' (and other) primops generate 'libm' calls, -+ -- but ghc itself does not add '-lm' -+ extra-libraries: m diff --git a/dev-lang/ghc/files/ghc-8.10.5-modorigin-verbose-conflict.patch b/dev-lang/ghc/files/ghc-8.10.5-modorigin-verbose-conflict.patch deleted file mode 100644 index a34c0c9059fe..000000000000 --- a/dev-lang/ghc/files/ghc-8.10.5-modorigin-verbose-conflict.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/compiler/main/Packages.hs -+++ b/compiler/main/Packages.hs -@@ -219,12 +219,14 @@ fromFlag = ModOrigin Nothing [] [] True - instance Semigroup ModuleOrigin where - ModOrigin e res rhs f <> ModOrigin e' res' rhs' f' = - ModOrigin (g e e') (res ++ res') (rhs ++ rhs') (f || f') -- where g (Just b) (Just b') -+ where g x@(Just b) y@(Just b') - | b == b' = Just b -- | otherwise = panic "ModOrigin: package both exposed/hidden" -+ | otherwise = pprPanic "ModOrigin: package both exposed/hidden" $ -+ text "x: " <> ppr x $$ text "y: " <> ppr y - g Nothing x = x - g x Nothing = x -- _x <> _y = panic "ModOrigin: hidden module redefined" -+ x <> y = pprPanic "ModOrigin: hidden module redefined" $ -+ text "x: " <> ppr x $$ text "y: " <> ppr y - - instance Monoid ModuleOrigin where - mempty = ModOrigin Nothing [] [] False diff --git a/dev-lang/ghc/files/ghc-8.10.6-aclocal.patch b/dev-lang/ghc/files/ghc-8.10.6-aclocal.patch deleted file mode 100644 index 8bd3ce58d072..000000000000 --- a/dev-lang/ghc/files/ghc-8.10.6-aclocal.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/aclocal.m4 b/aclocal.m4 -index 47d69c5..212ebc6 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -966,17 +966,15 @@ struct nlist xYzzY1[] = {{"xYzzY1", 0},{0}}; - struct nlist xYzzY2[] = {{"_xYzzY2", 0},{0}}; - #endif - --int main(argc, argv) --int argc; --char **argv; -+int main(int argc, char **argv) - { - #if defined(HAVE_NLIST_H) - if(nlist(argv[0], xYzzY1) == 0 && xYzzY1[0].n_value != 0) -- exit(1); -+ return 1; - if(nlist(argv[0], xYzzY2) == 0 && xYzzY2[0].n_value != 0) -- exit(0); -+ return 0; - #endif -- exit(1); -+ return 1; - }]])],[fptools_cv_leading_underscore=yes],[fptools_cv_leading_underscore=no],[fptools_cv_leading_underscore=no]) - ;; - esac]); diff --git a/dev-lang/ghc/files/ghc-8.2.1-darwin.patch b/dev-lang/ghc/files/ghc-8.2.1-darwin.patch deleted file mode 100644 index 53fedc4e4402..000000000000 --- a/dev-lang/ghc/files/ghc-8.2.1-darwin.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d39a3409acd3c40fb018ec1c114f15d3ecef6ef9 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyfox@gentoo.org> -Date: Thu, 1 Jun 2017 22:30:05 +0100 -Subject: [PATCH] aclocal.m4: add support for versioned darwin triplets - -The change adds support for 'darwin*' OS: - $ ./configure --target=aarch64-apple-darwin14 - -Reported-by: jp_rider -Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> ---- - aclocal.m4 | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/aclocal.m4 b/aclocal.m4 -index 7ad9c36453..437974a0c7 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -1906,6 +1906,9 @@ AC_DEFUN([GHC_CONVERT_OS],[ - aix*) # e.g. powerpc-ibm-aix7.1.3.0 - $3="aix" - ;; -+ darwin*) # e.g. aarch64-apple-darwin14 -+ $3="darwin" -+ ;; - freebsd*) # like i686-gentoo-freebsd7 - # i686-gentoo-freebsd8 - # i686-gentoo-freebsd8.2 --- -2.14.1 - diff --git a/dev-lang/ghc/files/ghc-8.2.1_rc1-hp2ps-cross.patch b/dev-lang/ghc/files/ghc-8.2.1_rc1-hp2ps-cross.patch deleted file mode 100644 index 26382b3cf44c..000000000000 --- a/dev-lang/ghc/files/ghc-8.2.1_rc1-hp2ps-cross.patch +++ /dev/null @@ -1,104 +0,0 @@ -commit ff84d052850b637b03bbb98cf05202e44886257d -Author: Sergei Trofimovich <slyfox@gentoo.org> -Date: Sat Apr 8 10:02:34 2017 +0100 - - cross-build 'unlit' and 'hp2ps' for stage2 install - - In navive build case it does not matter much if we build - 'unlit' and 'hp2ps' tools with ghc-stage0 or ghc-stage1: - both GHCs are native compilers and both tools are written - in C (have no haskell code). - - But in cross-case the difference is substantial: - In Stag1Only=YES case we need to install native tools built - by ghc-stage0/${host}-cc. - In Stag1Only=NO case we need to install cross-built tools - built by ghc-stage1/${target}-cc. - - Before this change GHC did not have a rule to build cross-built - 'unlit' and 'hp2ps'. - - The change adds cross-built 'unlit' and 'hp2ps' as 'dist-install' - targets. - - 'inplace/lib/bin/unlit.bin' target is unchanged and still contains - native binary. - - As a result this change allows cross-building and packaging whole - GHC for target platform! - - Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> - -diff --git a/utils/hp2ps/ghc.mk b/utils/hp2ps/ghc.mk -index f6e01ec6c1..21ce87dcfa 100644 ---- a/utils/hp2ps/ghc.mk -+++ b/utils/hp2ps/ghc.mk -@@ -10,6 +10,7 @@ - # - # ----------------------------------------------------------------------------- - -+# stage0 - utils/hp2ps_dist_C_SRCS = AreaBelow.c Curves.c Error.c Main.c \ - Reorder.c TopTwenty.c AuxFile.c Deviation.c \ - HpFile.c Marks.c Scale.c TraceElement.c \ -@@ -17,11 +18,27 @@ utils/hp2ps_dist_C_SRCS = AreaBelow.c Curves.c Error.c Main.c \ - Utilities.c - utils/hp2ps_dist_EXTRA_LIBRARIES = m - utils/hp2ps_dist_PROGNAME = hp2ps --utils/hp2ps_dist_INSTALL = YES - utils/hp2ps_dist_INSTALL_INPLACE = YES - utils/hp2ps_dist_SHELL_WRAPPER = YES - utils/hp2ps_dist_INSTALL_SHELL_WRAPPER_NAME = hp2ps - - utils/hp2ps_CC_OPTS += $(addprefix -I,$(GHC_INCLUDE_DIRS)) - -+# stage 1 -+utils/hp2ps_dist-install_C_SRCS = $(utils/hp2ps_dist_C_SRCS) -+utils/hp2ps_dist-install_EXTRA_LIBRARIES = $(utils/hp2ps_dist_EXTRA_LIBRARIES) -+utils/hp2ps_dist-install_PROGNAME = $(utils/hp2ps_dist_PROGNAME) -+utils/hp2ps_dist-install_INSTALL_INPLACE = NO -+utils/hp2ps_dist-install_SHELL_WRAPPER = YES -+utils/hp2ps_dist-install_INSTALL_SHELL_WRAPPER_NAME = $(utils/hp2ps_dist_INSTALL_SHELL_WRAPPER_NAME) -+ -+ifeq "$(Stage1Only)" "YES" -+utils/hp2ps_dist_INSTALL = YES -+utils/hp2ps_dist-install_INSTALL = NO -+else -+utils/hp2ps_dist_INSTALL = NO -+utils/hp2ps_dist-install_INSTALL = YES -+endif -+ - $(eval $(call build-prog,utils/hp2ps,dist,0)) -+$(eval $(call build-prog,utils/hp2ps,dist-install,1)) -diff --git a/utils/unlit/ghc.mk b/utils/unlit/ghc.mk -index e947989b5e..8911f4e856 100644 ---- a/utils/unlit/ghc.mk -+++ b/utils/unlit/ghc.mk -@@ -10,11 +10,25 @@ - # - # ----------------------------------------------------------------------------- - -+# built by ghc-stage0 - utils/unlit_dist_C_SRCS = unlit.c - utils/unlit_dist_PROGNAME = unlit - utils/unlit_dist_TOPDIR = YES --utils/unlit_dist_INSTALL = YES - utils/unlit_dist_INSTALL_INPLACE = YES - --$(eval $(call build-prog,utils/unlit,dist,0)) -+# built by ghc-stage1 -+utils/unlit_dist-install_C_SRCS = $(utils/unlit_dist_C_SRCS) -+utils/unlit_dist-install_PROGNAME = $(utils/unlit_dist_PROGNAME) -+utils/unlit_dist-install_TOPDIR = $(utils/unlit_dist_TOPDIR) -+utils/unlit_dist-install_INSTALL_INPLACE = NO -+ -+ifeq "$(Stage1Only)" "YES" -+utils/unlit_dist_INSTALL = YES -+utils/unlit_dist-install_INSTALL = NO -+else -+utils/unlit_dist_INSTALL = NO -+utils/unlit_dist-install_INSTALL = YES -+endif - -+$(eval $(call build-prog,utils/unlit,dist,0)) -+$(eval $(call build-prog,utils/unlit,dist-install,1)) diff --git a/dev-lang/ghc/files/ghc-8.8.1-revert-CPP.patch b/dev-lang/ghc/files/ghc-8.8.1-revert-CPP.patch deleted file mode 100644 index 8535cf09ef34..000000000000 --- a/dev-lang/ghc/files/ghc-8.8.1-revert-CPP.patch +++ /dev/null @@ -1,52 +0,0 @@ -Don't pass CPP options. Otherwise ghc-8.8.1 can't build itself. -Eventually ghc will fix it's headers at propagate defines. - -https://gitlab.haskell.org/ghc/ghc/commit/cfd3e0f1cfd16c8f35cae139d2a871a32eb4d2e1 -https://gitlab.haskell.org/ghc/ghc/issues/17146 - ---- a/compiler/main/DriverPipeline.hs -+++ b/compiler/main/DriverPipeline.hs -@@ -1190,6 +1190,9 @@ runPhase (RealPhase Cmm) input_fn dflags - ----------------------------------------------------------------------------- - -- Cc phase - -+-- we don't support preprocessing .c files (with -E) now. Doing so introduces -+-- way too many hacks, and I can't say I've ever used it anyway. -+ - runPhase (RealPhase cc_phase) input_fn dflags - | any (cc_phase `eqPhase`) [Cc, Ccxx, HCc, Cobjc, Cobjcxx] - = do -@@ -1211,16 +1214,6 @@ runPhase (RealPhase cc_phase) input_fn dflags - (includePathsQuote cmdline_include_paths) - let include_paths = include_paths_quote ++ include_paths_global - -- -- pass -D or -optP to preprocessor when compiling foreign C files -- -- (#16737). Doing it in this way is simpler and also enable the C -- -- compiler to performs preprocessing and parsing in a single pass, -- -- but it may introduce inconsistency if a different pgm_P is specified. -- let more_preprocessor_opts = concat -- [ ["-Xpreprocessor", i] -- | not hcc -- , i <- getOpts dflags opt_P -- ] -- - let gcc_extra_viac_flags = extraGccViaCFlags dflags - let pic_c_flags = picCCOpts dflags - -@@ -1230,7 +1223,7 @@ runPhase (RealPhase cc_phase) input_fn dflags - -- hc code doesn't not #include any header files anyway, so these - -- options aren't necessary. - pkg_extra_cc_opts <- liftIO $ -- if hcc -+ if cc_phase `eqPhase` HCc - then return [] - else getPackageExtraCcOpts dflags pkgs - -@@ -1312,7 +1305,6 @@ runPhase (RealPhase cc_phase) input_fn dflags - ++ [ "-include", ghcVersionH ] - ++ framework_paths - ++ include_paths -- ++ more_preprocessor_opts - ++ pkg_extra_cc_opts - )) - diff --git a/dev-lang/ghc/ghc-8.10.6-r3.ebuild b/dev-lang/ghc/ghc-8.10.6-r3.ebuild deleted file mode 100644 index e7ea76723be7..000000000000 --- a/dev-lang/ghc/ghc-8.10.6-r3.ebuild +++ /dev/null @@ -1,869 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# to make make a crosscompiler use crossdev and symlink ghc tree into -# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc' -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} = ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} - fi -fi - -PYTHON_COMPAT=( python3_{9..11} ) -inherit python-any-r1 -inherit autotools bash-completion-r1 flag-o-matic ghc-package -inherit multiprocessing pax-utils toolchain-funcs prefix -inherit check-reqs unpacker -DESCRIPTION="The Glasgow Haskell Compiler" -HOMEPAGE="https://www.haskell.org/ghc/" - -# we don't have any binaries yet -arch_binaries="" - -BIN_PV=${PV} -[[ $PR != r0 ]] && BIN_REV=${PR} - -# Differentiate glibc/musl - -#glibc_binaries="$glibc_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )" -glibc_binaries+=" amd64? ( https://eidetic.codes/${PN}-bin-${PVR}-x86_64-pc-linux-gnu.gpkg.tar )" -#glibc_binaries="$glibc_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )" -#glibc_binaries="$glibc_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )" -#glibc_binaries="$glibc_binaries ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )" -#glibc_binaries="$glibc_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )" -#glibc_binaries="$glibc_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )" -#glibc_binaries="$glibc_binaries ppc64? ( -# big-endian? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-powerpc64-unknown-linux-gnu.tar.gz ) -# !big-endian? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-powerpc64le-unknown-linux-gnu.tar.gz ) -#)" -#glibc_binaries="$glibc_binaries riscv? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-riscv64-unknown-linux-gnu.tar.gz )" -#glibc_binaries="$glibc_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )" -glibc_binaries+=" x86? ( https://eidetic.codes/${PN}-bin-${PVR}-i686-pc-linux-gnu.gpkg.tar )" - -#musl_binaries="$musl_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )" -#musl_binaries="$musl_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-musl.tbz2 )" -#musl_binaries="$musl_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-musl.tbz2 )" -#musl_binaries="$musl_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-musl.tbz2 )" -#musl_binaries="$musl_binaries ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )" -#musl_binaries="$musl_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )" -#musl_binaries="$musl_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )" -#musl_binaries="$musl_binaries ppc64? ( !big-endian? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-powerpc64le-unknown-linux-musl.tar.gz ) )" -#musl_binaries="$musl_binaries riscv? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-riscv64-unknown-linux-musl.tar.gz )" -#musl_binaries="$musl_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )" -#musl_binaries="$musl_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-musl.tbz2 )" - -[[ -n $glibc_binaries ]] && arch_binaries+=" elibc_glibc? ( $glibc_binaries )" -[[ -n $musl_binaries ]] && arch_binaries+=" elibc_musl? ( $musl_binaries )" - -# various ports: -#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )" - -# 0 - yet -yet_binary() { - case "${ELIBC}" in - glibc) - case "${ARCH}" in - #alpha) return 0 ;; - #arm64) return 0 ;; - #arm) return 0 ;; - amd64) return 0 ;; - #ia64) return 0 ;; - #ppc) return 0 ;; - #ppc64) return 0 ;; - #riscv) return 0 ;; - #sparc) return 0 ;; - x86) return 0 ;; - *) return 1 ;; - esac - ;; - musl) - case "${ARCH}" in - #alpha) return 0 ;; - #arm64) return 0 ;; - #arm) return 0 ;; - #amd64) return 0 ;; - #ia64) return 0 ;; - #ppc) return 0 ;; - #ppc64) - # use big-endian || return 0 - # ;; - #riscv) return 0 ;; - #sparc) return 0 ;; - #x86) return 0 ;; - *) return 1 ;; - esac - ;; - *) return 1 ;; - esac -} - -GHC_PV=${PV} -#GHC_PV=8.10.0.20200123 # uncomment only for -alpha, -beta, -rc ebuilds -GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct - -SRC_URI="!binary? ( - https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-src.tar.xz - test? ( https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-testsuite.tar.xz ) -)" -S="${WORKDIR}"/${GHC_P} - -[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )" - -BUMP_LIBRARIES=( - # "hackage-name hackage-version" - "process 1.6.16.0" -) - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="big-endian +doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test" -IUSE+=" binary" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-lang/perl-5.6.1 - dev-libs/gmp:0= - sys-libs/ncurses:=[unicode(+)] - elfutils? ( dev-libs/elfutils ) - !ghcmakebinary? ( dev-libs/libffi:=[-exec-static-trampoline] ) - numa? ( sys-process/numactl ) -" - -# This set of dependencies is needed to run -# prebuilt ghc. We specifically avoid ncurses -# dependency with: -# utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING -PREBUILT_BINARY_DEPENDS=" - !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) -" -# This set of dependencies is needed to install -# ghc[binary] in system. terminfo package is linked -# against ncurses. -PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS} - sys-libs/ncurses:0/6 -" - -RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )" - -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - doc? ( app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-python/sphinx - >=dev-libs/libxslt-1.1.2 ) - !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} ) - test? ( ${PYTHON_DEPS} ) -" - -needs_python() { - # test driver is written in python - use test && return 0 - return 1 -} - -# we build binaries without profiling support -REQUIRED_USE=" - ?? ( ghcbootstrap binary ) - ?? ( profile binary ) -" - -# haskell libraries built with cabal in configure mode, #515354 -QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc" - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -is_native() { - [[ ${CHOST} == ${CBUILD} ]] && [[ ${CHOST} == ${CTARGET} ]] -} - -if ! is_crosscompile; then - PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )" -fi - -# returns tool prefix for crosscompiler. -# Example: -# CTARGET=armv7a-unknown-linux-gnueabi -# CHOST=x86_64-pc-linux-gnu -# "armv7a-unknown-linux-gnueabi-" -# CTARGET=${CHOST} -# "" -# Used in tools and library prefix: -# "${ED}"/usr/bin/$(cross)haddock -# "${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d" - -cross() { - if is_crosscompile; then - echo "${CTARGET}-" - else - echo "" - fi -} - -append-ghc-cflags() { - local persistent compile assemble link - local flag ghcflag - - for flag in $*; do - case ${flag} in - persistent) persistent="yes";; - compile) compile="yes";; - assemble) assemble="yes";; - link) link="yes";; - *) - [[ ${compile} ]] && ghcflag="-optc${flag}" CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" && - [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}" - [[ ${assemble} ]] && ghcflag="-opta${flag}" CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" && - [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}" - [[ ${link} ]] && ghcflag="-optl${flag}" LDFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" && - [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}" - ;; - esac - done -} - -# $1 - lib name (under libraries/) -# $2 - lib version -# example: bump_lib "transformers" "0.4.2.0" -bump_lib() { - local pn=$1 pv=$2 - local p=${pn}-${pv} - local f - - einfo "Bumping ${pn} up to ${pv}" - - for f in ghc.mk GNUmakefile; do - mv libraries/"${pn}"/$f "${WORKDIR}"/"${p}"/$f || die - done - mv libraries/"${pn}" "${WORKDIR}"/"${pn}".old || die - mv "${WORKDIR}"/"${p}" libraries/"${pn}" || die -} - -update_SRC_URI() { - local p pn pv - for p in "${BUMP_LIBRARIES[@]}"; do - set -- $p - pn=$1 pv=$2 - - SRC_URI+=" https://hackage.haskell.org/package/${pn}-${pv}/${pn}-${pv}.tar.gz" - done -} - -update_SRC_URI - -bump_libs() { - local p pn pv - for p in "${BUMP_LIBRARIES[@]}"; do - set -- $p - pn=$1 pv=$2 - - bump_lib "${pn}" "${pv}" - done -} - -ghc_setup_cflags() { - # TODO: plumb CFLAGS and BUILD_CFLAGS to respective CONF_CC_OPTS_STAGE<N> - if ! is_native; then - export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"} - export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"} - einfo "Crosscompiling mode:" - einfo " CHOST: ${CHOST}" - einfo " CTARGET: ${CTARGET}" - einfo " CFLAGS: ${CFLAGS}" - einfo " LDFLAGS: ${LDFLAGS}" - einfo " prefix: $(cross)" - return - fi - # We need to be very careful with the CFLAGS we ask ghc to pass through to - # gcc. There are plenty of flags which will make gcc produce output that - # breaks ghc in various ways. The main ones we want to pass through are - # -mcpu / -march flags. These are important for arches like alpha & sparc. - # We also use these CFLAGS for building the C parts of ghc, ie the rts. - strip-flags - strip-unsupported-flags - - # Cmm can't parse line numbers #482086 - replace-flags -ggdb[3-9] -ggdb2 - - GHC_FLAGS="" - GHC_PERSISTENT_FLAGS="" - for flag in ${CFLAGS}; do - case ${flag} in - - # Ignore extra optimisation (ghc passes -O to gcc anyway) - # -O2 and above break on too many systems - -O*) ;; - - # Arch and ABI flags are what we're really after - -m*) append-ghc-cflags compile assemble ${flag};; - - # Sometimes it's handy to see backtrace of RTS - # to get an idea what happens there - -g*) append-ghc-cflags compile ${flag};; - - # Ignore all other flags, including all -f* flags - esac - done - - for flag in ${LDFLAGS}; do - append-ghc-cflags link ${flag} - done - - # GHC uses ${CBUILD}-gcc, ${CHOST}-gcc and ${CTARGET}-gcc at a single build. - # Skip any gentoo-specific tweaks for cross-case to avoid passing unsupported - # options to gcc. - if is_native; then - # prevent from failing to build unregisterised ghc: - # https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html - use ppc64 && append-ghc-cflags persistent compile -mminimal-toc - fi -} - -# substitutes string $1 to $2 in files $3 $4 ... -relocate_path() { - local from=$1 - local to=$2 - shift 2 - local file= - for file in "$@" - do - sed -i -e "s|$from|$to|g" \ - "$file" || die "path relocation failed for '$file'" - done -} - -# changes hardcoded ghc paths and updates package index -# $1 - new absolute root path -relocate_ghc() { - local to=$1 ghc_v=${BIN_PV} - - # libdir for prebuilt binary and for current system may mismatch - # It does for prefix installation for example: bug #476998 - local bin_ghc_prefix=${WORKDIR}/usr - local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*) - local bin_libdir=${bin_libpath#${bin_ghc_prefix}/} - - # backup original script to use it later after relocation - local gp_back="${T}/ghc-pkg-${ghc_v}-orig" - cp "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" "$gp_back" || die "unable to backup ghc-pkg wrapper" - - if [[ ${bin_libdir} != $(get_libdir) ]]; then - einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)" - # moving the dir itself is not strictly needed - # but then USE=binary would result in installing - # in '${bin_libdir}' - mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die - - relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \ - "${WORKDIR}/usr/bin/ghc-${ghc_v}" \ - "${WORKDIR}/usr/bin/ghci-${ghc_v}" \ - "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \ - "${WORKDIR}/usr/bin/hsc2hs" \ - "${WORKDIR}/usr/bin/runghc-${ghc_v}" \ - "$gp_back" \ - "${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"* - fi - - # Relocate from /usr to ${EPREFIX}/usr - relocate_path "/usr" "${to}/usr" \ - "${WORKDIR}/usr/bin/ghc-${ghc_v}" \ - "${WORKDIR}/usr/bin/ghci-${ghc_v}" \ - "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \ - "${WORKDIR}/usr/bin/haddock-ghc-${ghc_v}" \ - "${WORKDIR}/usr/bin/hp2ps" \ - "${WORKDIR}/usr/bin/hpc" \ - "${WORKDIR}/usr/bin/hsc2hs" \ - "${WORKDIR}/usr/bin/runghc-${ghc_v}" \ - "${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"* - - # this one we will use to regenerate cache - # so it should point to current tree location - relocate_path "/usr" "${WORKDIR}/usr" "$gp_back" - - if use prefix; then - hprefixify "${bin_libpath}"/${PN}*/settings - fi - - # regenerate the binary package cache - "$gp_back" recache || die "failed to update cache after relocation" - rm "$gp_back" -} - -ghc-check-reqs() { - # These are pessimistic values (slightly bigger than worst-case) - # Worst case is UNREG USE=profile ia64. See bug #611866 for some - # numbers on various arches. - CHECKREQS_DISK_BUILD=8G - CHECKREQS_DISK_USR=2G - # USE=binary roughly takes - use binary && CHECKREQS_DISK_BUILD=4G - - "$@" -} - -pkg_pretend() { - ghc-check-reqs check-reqs_pkg_pretend -} - -pkg_setup() { - ghc-check-reqs check-reqs_pkg_setup - - # quiet portage about prebuilt binaries - use binary && QA_PREBUILT="*" - - [[ ${MERGE_TYPE} == binary ]] && return - - if use ghcbootstrap; then - ewarn "You requested ghc bootstrapping, this is usually only used" - ewarn "by Gentoo developers to make binary .tbz2 packages." - - [[ -z $(type -P ghc) ]] && \ - die "Could not find a ghc to bootstrap with." - else - if ! yet_binary; then - eerror "Please try emerging with USE=ghcbootstrap and report build" - eerror "sucess or failure to the haskell team (haskell@gentoo.org)" - die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap" - fi - fi - - if needs_python; then - python-any-r1_pkg_setup - fi -} - -src_unpack() { - # Create the ${S} dir if we're using the binary version - use binary && mkdir "${S}" - - # the Solaris and Darwin binaries from ghc (maeder) need to be - # unpacked separately, so prevent them from being unpacked - local ONLYA=${A} - case ${CHOST} in - *-darwin* | *-solaris*) ONLYA=${GHC_P}-src.tar.xz ;; - esac - unpacker ${ONLYA} -} - -src_prepare() { - # Force the use of C.utf8 locale - # <https://github.com/gentoo-haskell/gentoo-haskell/issues/1287> - # <https://github.com/gentoo-haskell/gentoo-haskell/issues/1289> - export LC_ALL=C.utf8 - - ghc_setup_cflags - - if ! use ghcbootstrap; then - # The switch to gpkg binaries means that they are unpacked in the wrong - # location. They are now unnpacked in the $orig_bindir and need to be - # moved so that usr/ is in $WORKDIR. - local orig_bindir="${WORKDIR}/${PN}-${BIN_PV}${BIN_REV:+-${BIN_REV}}" - mv -v "${orig_bindir}/image/usr" "${WORKDIR}" || die - - if [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then - # Modify the wrapper script from the binary tarball to use GHC_PERSISTENT_FLAGS. - # See bug #313635. - sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \ - "${WORKDIR}/usr/bin/ghc-${BIN_PV}" - - # allow hardened users use vanilla binary to bootstrap ghc - # ghci uses mmap with rwx protection at it implements dynamic - # linking on it's own (bug #299709) - pax-mark -m "${WORKDIR}/usr/$(get_libdir)/${PN}-${BIN_PV}/bin/ghc" - fi - fi - - if use binary; then - if use prefix; then - relocate_ghc "${EPREFIX}" - fi - - # Move unpacked files to the expected place - mv "${WORKDIR}/usr" "${S}" - eapply_user - else - if ! use ghcbootstrap; then - case ${CHOST} in - *-darwin* | *-solaris*) - # UPDATE ME for ghc-7 - mkdir "${WORKDIR}"/ghc-bin-installer || die - pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die - use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2 - popd > /dev/null - - pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die - # fix the binaries so they run, on Solaris we need an - # LD_LIBRARY_PATH which has our prefix libdirs, on - # Darwin we need to replace the frameworks with our libs - # from the prefix fix before installation, because some - # of the tools are actually used during configure/make - if [[ ${CHOST} == *-solaris* ]] ; then - export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}" - elif [[ ${CHOST} == *-darwin* ]] ; then - local readline_framework=GNUreadline.framework/GNUreadline - local gmp_framework=/opt/local/lib/libgmp.10.dylib - local ncurses_file=/opt/local/lib/libncurses.5.dylib - for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do - install_name_tool -change \ - ${readline_framework} \ - "${EPREFIX}"/lib/libreadline.dylib \ - ${binary} || die - install_name_tool -change \ - ${gmp_framework} \ - "${EPREFIX}"/usr/lib/libgmp.dylib \ - ${binary} || die - install_name_tool -change \ - ${ncurses_file} \ - "${EPREFIX}"/usr/lib/libncurses.dylib \ - ${binary} || die - done - # we don't do frameworks! - sed -i \ - -e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \ - -e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \ - rts/package.conf.in || die - fi - - # it is autoconf, but we really don't want to give it too - # many arguments, in fact we do the make in-place anyway - ./configure --prefix="${WORKDIR}"/usr || die - make install || die - popd > /dev/null - ;; - *) - relocate_ghc "${WORKDIR}" - ;; - esac - fi - - sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \ - "${S}/ghc/ghc.wrapper" - - cd "${S}" # otherwise eapply will break - - eapply "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch - eapply "${FILESDIR}"/${PN}-8.2.1-darwin.patch - eapply "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch - eapply "${FILESDIR}"/${PN}-8.8.1-revert-CPP.patch - eapply "${FILESDIR}"/${PN}-8.10.1-allow-cross-bootstrap.patch - eapply "${FILESDIR}"/${PN}-8.10.5-modorigin-verbose-conflict.patch - eapply "${FILESDIR}"/${PN}-8.10.6-aclocal.patch - eapply "${FILESDIR}"/${PN}-9.0.2-sphinx-6.patch - - # a bunch of crosscompiler patches - # needs newer version: - #eapply "${FILESDIR}"/${PN}-8.2.1_rc1-hp2ps-cross.patch - - # mingw32 target - pushd "${S}/libraries/Win32" - eapply "${FILESDIR}"/${PN}-8.2.1_rc1-win32-cross-2-hack.patch # bad workaround - popd - - bump_libs - - eapply_user - # as we have changed the build system - eautoreconf - fi -} - -src_configure() { - if ! use binary; then - # initialize build.mk - echo '# Gentoo changes' > mk/build.mk - - # Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV} - echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk - echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk - - # We also need to use the GHC_FLAGS flags when building ghc itself - echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk - echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk - echo "SRC_LD_OPTS+=${LDFLAGS}" >> mk/build.mk - # Speed up initial Cabal bootstrap - echo "utils/ghc-cabal_dist_EXTRA_HC_OPTS+=$(ghc-make-args)" >> mk/build.mk - - # We can't depend on haddock except when bootstrapping when we - # must build docs and include them into the binary .tbz2 package - # app-text/dblatex is not in portage, can not build PDF or PS - echo "BUILD_SPHINX_PDF = NO" >> mk/build.mk - echo "BUILD_SPHINX_HTML = $(usex doc YES NO)" >> mk/build.mk - echo "BUILD_MAN = $(usex doc YES NO)" >> mk/build.mk - - # this controls presence on 'xhtml' and 'haddock' in final install - echo "HADDOCK_DOCS = YES" >> mk/build.mk - - # not used outside of ghc's test - if [[ -n ${GHC_BUILD_DPH} ]]; then - echo "BUILD_DPH = YES" >> mk/build.mk - else - echo "BUILD_DPH = NO" >> mk/build.mk - fi - - # Any non-native build has to skip as it needs - # target haddock binary to be runnabine. - if ! is_native; then - # disable docs generation as it requires running stage2 - echo "HADDOCK_DOCS=NO" >> mk/build.mk - echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk - echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk - fi - - if is_crosscompile; then - # Install ghc-stage1 crosscompiler instead of - # ghc-stage2 cross-built compiler. - echo "Stage1Only=YES" >> mk/build.mk - fi - - # allows overriding build flavours for libraries: - # v - vanilla (static libs) - # p - profiled - # dyn - shared libraries - # example: GHC_LIBRARY_WAYS="v dyn" - if [[ -n ${GHC_LIBRARY_WAYS} ]]; then - echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk - fi - echo "BUILD_PROF_LIBS = $(usex profile YES NO)" >> mk/build.mk - - # Get ghc from the unpacked binary .tbz2 - # except when bootstrapping we just pick ghc up off the path - if ! use ghcbootstrap; then - export PATH="${WORKDIR}/usr/bin:${PATH}" - fi - - echo "INTEGER_LIBRARY = $(usex gmp integer-gmp integer-simple)" >> mk/build.mk - - # don't strip anything. Very useful when stage2 SIGSEGVs on you - echo "STRIP_CMD = :" >> mk/build.mk - - local econf_args=() - - # GHC embeds toolchain it was built by and uses it later. - # Don't allow things like ccache or versioned binary slip. - # We use stable thing across gcc upgrades. - # User can use EXTRA_ECONF=CC=... to override this default. - econf_args+=( - AR=${CTARGET}-ar - CC=${CTARGET}-gcc - # these should be inferred by GHC but ghc defaults - # to using bundled tools on windows. - Windres=${CTARGET}-windres - DllWrap=${CTARGET}-dllwrap - # we set the linker explicitly below - --disable-ld-override - ) - case ${CTARGET} in - arm*) - # ld.bfd-2.28 does not work for ghc. Force ld.gold - # instead. This should be removed once gentoo gets - # a fix for R_ARM_COPY bug: https://sourceware.org/PR16177 - econf_args+=(LD=${CTARGET}-ld.gold) - ;; - sparc*) - # ld.gold-2.28 does not work for ghc. Force ld.bfd - # instead. This should be removed once gentoo gets - # a fix for missing --no-relax support bug: - # https://sourceware.org/ml/binutils/2017-07/msg00183.html - econf_args+=(LD=${CTARGET}-ld.bfd) - ;; - *) - econf_args+=(LD=${CTARGET}-ld) - esac - - if [[ ${CBUILD} != ${CHOST} ]]; then - # GHC bug: ghc claims not to support cross-building. - # It does, but does not distinct --host= value - # for stage1 and stage2 compiler. - econf_args+=(--host=${CBUILD}) - fi - - if use ghcmakebinary; then - # When building booting libary we are trying to - # bundle or restrict most of external depends - # with unstable ABI: - # - embed libffi (default GHC behaviour) - # - disable ncurses support for ghci (via haskeline) - # https://bugs.gentoo.org/557478 - # - disable ncurses support for ghc-pkg - echo "libraries/haskeline_CONFIGURE_OPTS += --flag=-terminfo" >> mk/build.mk - echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk - elif is_native; then - # using ${GTARGET}'s libffi is not supported yet: - # GHC embeds full path for ffi includes without /usr/${CTARGET} account. - econf_args+=(--with-system-libffi) - econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@')) - fi - - einfo "Final mk/build.mk:" - cat mk/build.mk || die - - econf ${econf_args[@]} \ - --enable-bootstrap-with-devel-snapshot \ - $(use_enable elfutils dwarf-unwind) \ - $(use_enable numa) - - if [[ ${PV} == *9999* ]]; then - GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')" - GHC_P=${PN}-${GHC_PV} - fi - fi # ! use binary -} - -src_compile() { - if ! use binary; then - # Stage1Only crosscompiler does not build stage2 - if ! is_crosscompile; then - # 1. build/pax-mark compiler binary first - emake ghc/stage2/build/tmp/ghc-stage2 - # 2. pax-mark (bug #516430) - pax-mark -m ghc/stage2/build/tmp/ghc-stage2 - # 2. build/pax-mark haddock using ghc-stage2 - if is_native; then - # non-native build does not build haddock - # due to HADDOCK_DOCS=NO, but it could. - emake utils/haddock/dist/build/tmp/haddock - pax-mark -m utils/haddock/dist/build/tmp/haddock - fi - fi - # 3. and then all the rest - emake all - fi # ! use binary -} - -src_test() { - # TODO: deal with: - # - sandbox (pollutes environment) - # - extra packages (to extend testsuite coverage) - # bits are taken from 'validate' - local make_test_target='test' # can be fulltest - # not 'emake' as testsuite uses '$MAKE' without jobserver available - make $make_test_target stage=2 THREADS=$(makeopts_jobs) -} - -src_install() { - if use binary; then - use prefix && mkdir -p "${ED}" - mv "${S}/usr" "${ED}" - else - [[ -f VERSION ]] || emake VERSION - - # -j1 due to a rare race in install script: - # make --no-print-directory -f ghc.mk phase=final install - # /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 755 \ - # -d "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404/include" - # /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 644 utils/hsc2hs/template-hsc.h \ - # "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404" - # /usr/bin/install: cannot create regular file \ - # '/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404': No such file or directory - emake -j1 install DESTDIR="${D}" - - # Skip for cross-targets as they all share target location: - # /usr/share/doc/ghc-9999/ - if ! is_crosscompile; then - dodoc "distrib/README" "LICENSE" "VERSION" - fi - - # rename ghc-shipped files to avoid collision - # of external packages. Motivating example: - # user had installed: - # dev-lang/ghc-7.8.4-r0 (with transformers-0.3.0.0) - # dev-haskell/transformers-0.4.2.0 - # then user tried to update to - # dev-lang/ghc-7.8.4-r1 (with transformers-0.4.2.0) - # this will lead to single .conf file collision. - local shipped_conf renamed_conf - local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d" - for shipped_conf in "${package_confdir}"/*.conf; do - # rename 'pkg-ver-id.conf' to 'pkg-ver-id-gentoo-${PF}.conf' - renamed_conf=${shipped_conf%.conf}-gentoo-${PF}.conf - mv "${shipped_conf}" "${renamed_conf}" || die - done - - # remove link, but leave 'haddock-${GHC_P}' - rm -f "${ED}"/usr/bin/$(cross)haddock - - if ! is_crosscompile; then - newbashcomp "${FILESDIR}"/ghc-bash-completion ghc-pkg - newbashcomp utils/completion/ghc.bash ghc - fi - fi - - # path to the package.cache - local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d" - PKGCACHE="${package_confdir}"/package.cache - # copy the package.conf.d, including timestamp, save it so we can help - # users that have a broken package.conf.d - cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d" - - # copy the package.conf, including timestamp, save it so we later can put it - # back before uninstalling, or when upgrading. - cp -p "${PKGCACHE}"{,.shipped} \ - || die "failed to copy package.conf.d/package.cache" - - if is_crosscompile; then - # When we build a cross-compiler the layout is the following: - # usr/lib/${CTARGET}-ghc-${VER}/ contains target libraries - # but - # usr/lib/${CTARGET}-ghc-${VER}/bin/ directory - # containst host binaries (modulo bugs). - - # Portage's stripping mechanism does not skip stripping - # foreign binaries. This frequently causes binaries to be - # broken. - # - # Thus below we disable stripping of target libraries and allow - # stripping hosts executables. - dostrip -x "/usr/$(get_libdir)/$(cross)${GHC_P}" - dostrip "/usr/$(get_libdir)/$(cross)${GHC_P}/bin" - fi -} - -pkg_preinst() { - # have we got an earlier version of ghc installed? - if has_version "<${CATEGORY}/${PF}"; then - haskell_updater_warn="1" - fi -} - -pkg_postinst() { - ghc-reregister - - # path to the package.cache - PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache" - - # give the cache a new timestamp, it must be as recent as - # the package.conf.d directory. - touch "${PKGCACHE}" - - if [[ "${haskell_updater_warn}" == "1" ]]; then - ewarn - ewarn "\e[1;31m************************************************************************\e[0m" - ewarn - ewarn "You have just upgraded from an older version of GHC." - ewarn "You may have to run" - ewarn " 'haskell-updater'" - ewarn "to rebuild all ghc-based Haskell libraries." - ewarn - ewarn "\e[1;31m************************************************************************\e[0m" - ewarn - fi -} - -pkg_prerm() { - PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache" - rm -rf "${PKGCACHE}" - - cp -p "${PKGCACHE}"{.shipped,} -} - -pkg_postrm() { - ghc-package_pkg_postrm -} diff --git a/dev-lang/ghc/ghc-9.0.2-r3.ebuild b/dev-lang/ghc/ghc-9.0.2-r3.ebuild deleted file mode 100644 index 906bca62bde6..000000000000 --- a/dev-lang/ghc/ghc-9.0.2-r3.ebuild +++ /dev/null @@ -1,898 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# to make make a crosscompiler use crossdev and symlink ghc tree into -# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc' -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} = ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} - fi -fi - -PYTHON_COMPAT=( python3_{9..10} ) -inherit python-any-r1 -inherit autotools bash-completion-r1 flag-o-matic ghc-package -inherit multiprocessing pax-utils toolchain-funcs prefix -inherit check-reqs llvm -DESCRIPTION="The Glasgow Haskell Compiler" -HOMEPAGE="https://www.haskell.org/ghc/" - -# we don't have any binaries yet -arch_binaries="" - -BIN_PV=${PV} - -# Differentiate glibc/musl - -#glibc_binaries="$glibc_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )" -glibc_binaries="$glibc_binaries amd64? ( https://eidetic.codes/ghc-bin-${PV}-x86_64-pc-linux-gnu-r1.tbz2 )" -#glibc_binaries="$glibc_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )" -glibc_binaries="$glibc_binaries arm64? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tar.gz )" -#glibc_binaries="$glibc_binaries ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )" -#glibc_binaries="$glibc_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )" -#glibc_binaries="$glibc_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )" -glibc_binaries="$glibc_binaries ppc64? ( - big-endian? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-powerpc64-unknown-linux-gnu.tar.gz ) - !big-endian? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-powerpc64le-unknown-linux-gnu.tar.gz ) -)" -glibc_binaries="$glibc_binaries riscv? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-riscv64-unknown-linux-gnu.tar.gz )" -#glibc_binaries="$glibc_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )" -glibc_binaries="$glibc_binaries x86? ( https://eidetic.codes/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )" - -#musl_binaries="$musl_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )" -#musl_binaries="$musl_binaries amd64? ( https://eidetic.codes/ghc-bin-${PV}-x86_64-pc-linux-musl.tbz2 )" -#musl_binaries="$musl_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-musl.tbz2 )" -#musl_binaries="$musl_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-musl.tbz2 )" -#musl_binaries="$musl_binaries ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )" -#musl_binaries="$musl_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )" -#musl_binaries="$musl_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )" -#musl_binaries="$musl_binaries ppc64? ( !big-endian? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-powerpc64le-unknown-linux-musl.tar.gz ) )" -#musl_binaries="$musl_binaries riscv? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-riscv64-unknown-linux-musl.tar.gz )" -#musl_binaries="$musl_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )" -#musl_binaries="$musl_binaries x86? ( https://eidetic.codes/ghc-bin-${PV}-i686-pc-linux-musl.tbz2 )" - -[[ -n $glibc_binaries ]] && arch_binaries="$arch_binaries elibc_glibc? ( $glibc_binaries )" -[[ -n $musl_binaries ]] && arch_binaries="$arch_binaries elibc_musl? ( $musl_binaries )" - -# various ports: -#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )" - -# 0 - yet -yet_binary() { - case "${ELIBC}" in - glibc) - case "${ARCH}" in - #alpha) return 0 ;; - arm64) return 0 ;; - #arm) return 0 ;; - amd64) return 0 ;; - #ia64) return 0 ;; - #ppc) return 0 ;; - ppc64) return 0 ;; - riscv) return 0 ;; - #sparc) return 0 ;; - x86) return 0 ;; - *) return 1 ;; - esac - ;; - musl) - case "${ARCH}" in - #alpha) return 0 ;; - #arm64) return 0 ;; - #arm) return 0 ;; - #amd64) return 0 ;; - #ia64) return 0 ;; - #ppc) return 0 ;; - #ppc64) - # use big-endian || return 0 - # ;; - #riscv) return 0 ;; - #sparc) return 0 ;; - #x86) return 0 ;; - *) return 1 ;; - esac - ;; - esac -} - -GHC_PV=${PV} -#GHC_PV=8.10.0.20200123 # uncomment only for -alpha, -beta, -rc ebuilds -GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct - -SRC_URI="!binary? ( - https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-src.tar.xz - test? ( https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-testsuite.tar.xz ) -)" -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-riscv64-llvm.patch.xz" - -S="${WORKDIR}"/${GHC_P} - -[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )" - -BUMP_LIBRARIES=( - # "hackage-name hackage-version" -) - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="big-endian +doc elfutils ghcbootstrap ghcmakebinary +gmp llvm numa profile test unregisterised" -IUSE+=" binary" -RESTRICT="!test? ( test )" - -LLVM_MAX_SLOT="14" -RDEPEND=" - >=dev-lang/perl-5.6.1 - dev-libs/gmp:0= - sys-libs/ncurses:=[unicode(+)] - elfutils? ( dev-libs/elfutils ) - !ghcmakebinary? ( dev-libs/libffi:= ) - numa? ( sys-process/numactl ) - llvm? ( - <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= - || ( - sys-devel/llvm:14 - ) - ) -" - -# This set of dependencies is needed to run -# prebuilt ghc. We specifically avoid ncurses -# dependency with: -# utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING -PREBUILT_BINARY_DEPENDS=" - !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) -" -# This set of dependencies is needed to install -# ghc[binary] in system. terminfo package is linked -# against ncurses. -PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS} - sys-libs/ncurses:0/6 -" - -RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )" - -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - doc? ( app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-python/sphinx - >=dev-libs/libxslt-1.1.2 ) - !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} ) - test? ( ${PYTHON_DEPS} ) -" - -needs_python() { - # test driver is written in python - use test && return 0 - return 1 -} - -# we build binaries without profiling support -REQUIRED_USE=" - ?? ( ghcbootstrap binary ) - ?? ( profile binary ) - ?? ( llvm unregisterised ) -" - -# haskell libraries built with cabal in configure mode, #515354 -QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc" - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -is_native() { - [[ ${CHOST} == ${CBUILD} ]] && [[ ${CHOST} == ${CTARGET} ]] -} - -if ! is_crosscompile; then - PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )" -fi - -# returns tool prefix for crosscompiler. -# Example: -# CTARGET=armv7a-unknown-linux-gnueabi -# CHOST=x86_64-pc-linux-gnu -# "armv7a-unknown-linux-gnueabi-" -# CTARGET=${CHOST} -# "" -# Used in tools and library prefix: -# "${ED}"/usr/bin/$(cross)haddock -# "${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d" - -cross() { - if is_crosscompile; then - echo "${CTARGET}-" - else - echo "" - fi -} - -append-ghc-cflags() { - local persistent compile assemble link - local flag ghcflag - - for flag in $*; do - case ${flag} in - persistent) persistent="yes";; - compile) compile="yes";; - assemble) assemble="yes";; - link) link="yes";; - *) - [[ ${compile} ]] && ghcflag="-optc${flag}" CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" && - [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}" - [[ ${assemble} ]] && ghcflag="-opta${flag}" CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" && - [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}" - [[ ${link} ]] && ghcflag="-optl${flag}" LDFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" && - [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}" - ;; - esac - done -} - -# $1 - lib name (under libraries/) -# $2 - lib version -# example: bump_lib "transformers" "0.4.2.0" -bump_lib() { - local pn=$1 pv=$2 - local p=${pn}-${pv} - local f - - einfo "Bumping ${pn} up to ${pv}" - - for f in ghc.mk GNUmakefile; do - mv libraries/"${pn}"/$f "${WORKDIR}"/"${p}"/$f || die - done - mv libraries/"${pn}" "${WORKDIR}"/"${pn}".old || die - mv "${WORKDIR}"/"${p}" libraries/"${pn}" || die -} - -update_SRC_URI() { - local p pn pv - for p in "${BUMP_LIBRARIES[@]}"; do - set -- $p - pn=$1 pv=$2 - - SRC_URI+=" https://hackage.haskell.org/package/${pn}-${pv}/${pn}-${pv}.tar.gz" - done -} - -update_SRC_URI - -bump_libs() { - local p pn pv - for p in "${BUMP_LIBRARIES[@]}"; do - set -- $p - pn=$1 pv=$2 - - bump_lib "${pn}" "${pv}" - done -} - -ghc_setup_cflags() { - # TODO: plumb CFLAGS and BUILD_CFLAGS to respective CONF_CC_OPTS_STAGE<N> - if ! is_native; then - export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"} - export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"} - einfo "Crosscompiling mode:" - einfo " CHOST: ${CHOST}" - einfo " CTARGET: ${CTARGET}" - einfo " CFLAGS: ${CFLAGS}" - einfo " LDFLAGS: ${LDFLAGS}" - einfo " prefix: $(cross)" - return - fi - # We need to be very careful with the CFLAGS we ask ghc to pass through to - # gcc. There are plenty of flags which will make gcc produce output that - # breaks ghc in various ways. The main ones we want to pass through are - # -mcpu / -march flags. These are important for arches like alpha & sparc. - # We also use these CFLAGS for building the C parts of ghc, ie the rts. - strip-flags - strip-unsupported-flags - - # Cmm can't parse line numbers #482086 - replace-flags -ggdb[3-9] -ggdb2 - - GHC_FLAGS="" - GHC_PERSISTENT_FLAGS="" - for flag in ${CFLAGS}; do - case ${flag} in - - # Ignore extra optimisation (ghc passes -O to gcc anyway) - # -O2 and above break on too many systems - -O*) ;; - - # Arch and ABI flags are what we're really after - -m*) append-ghc-cflags compile assemble ${flag};; - - # Sometimes it's handy to see backtrace of RTS - # to get an idea what happens there - -g*) append-ghc-cflags compile ${flag};; - - # Ignore all other flags, including all -f* flags - esac - done - - for flag in ${LDFLAGS}; do - append-ghc-cflags link ${flag} - done -} - -# substitutes string $1 to $2 in files $3 $4 ... -relocate_path() { - local from=$1 - local to=$2 - shift 2 - local file= - for file in "$@" - do - sed -i -e "s|$from|$to|g" \ - "$file" || die "path relocation failed for '$file'" - done -} - -# changes hardcoded ghc paths and updates package index -# $1 - new absolute root path -relocate_ghc() { - local to=$1 ghc_v=${BIN_PV} - - # libdir for prebuilt binary and for current system may mismatch - # It does for prefix installation for example: bug #476998 - local bin_ghc_prefix=${WORKDIR}/usr - local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*) - local bin_libdir=${bin_libpath#${bin_ghc_prefix}/} - - # backup original script to use it later after relocation - local gp_back="${T}/ghc-pkg-${ghc_v}-orig" - cp "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" "$gp_back" || die "unable to backup ghc-pkg wrapper" - - if [[ ${bin_libdir} != $(get_libdir) ]]; then - einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)" - # moving the dir itself is not strictly needed - # but then USE=binary would result in installing - # in '${bin_libdir}' - mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die - - relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \ - "${WORKDIR}/usr/bin/ghc-${ghc_v}" \ - "${WORKDIR}/usr/bin/ghci-${ghc_v}" \ - "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \ - "${WORKDIR}/usr/bin/hsc2hs" \ - "${WORKDIR}/usr/bin/runghc-${ghc_v}" \ - "$gp_back" \ - "${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"* - fi - - # Relocate from /usr to ${EPREFIX}/usr - relocate_path "/usr" "${to}/usr" \ - "${WORKDIR}/usr/bin/ghc-${ghc_v}" \ - "${WORKDIR}/usr/bin/ghci-${ghc_v}" \ - "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \ - "${WORKDIR}/usr/bin/haddock-ghc-${ghc_v}" \ - "${WORKDIR}/usr/bin/hp2ps" \ - "${WORKDIR}/usr/bin/hpc" \ - "${WORKDIR}/usr/bin/hsc2hs" \ - "${WORKDIR}/usr/bin/runghc-${ghc_v}" \ - "${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"* - - # this one we will use to regenerate cache - # so it should point to current tree location - relocate_path "/usr" "${WORKDIR}/usr" "$gp_back" - - if use prefix; then - hprefixify "${bin_libpath}"/${PN}*/settings - fi - - # regenerate the binary package cache - "$gp_back" recache || die "failed to update cache after relocation" - rm "$gp_back" -} - -ghc-check-reqs() { - # These are pessimistic values (slightly bigger than worst-case) - # Worst case is UNREG USE=profile ia64. See bug #611866 for some - # numbers on various arches. - CHECKREQS_DISK_BUILD=8G - CHECKREQS_DISK_USR=2G - # USE=binary roughly takes - use binary && CHECKREQS_DISK_BUILD=4G - - "$@" -} - -llvmize() { - [[ -z "${1}" ]] && return - ( find "${1}" -type f \ - | file -if- \ - | grep "text/x-shellscript" \ - | awk -F: '{print $1}' \ - | xargs sed -i "s#^exec #PATH=\"$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin:\${PATH}\" exec #") || die -} - -pkg_pretend() { - ghc-check-reqs check-reqs_pkg_pretend -} - -pkg_setup() { - ghc-check-reqs check-reqs_pkg_setup - - # quiet portage about prebuilt binaries - use binary && QA_PREBUILT="*" - - [[ ${MERGE_TYPE} == binary ]] && return - - if use ghcbootstrap; then - ewarn "You requested ghc bootstrapping, this is usually only used" - ewarn "by Gentoo developers to make binary .tbz2 packages." - - [[ -z $(type -P ghc) ]] && \ - die "Could not find a ghc to bootstrap with." - else - if ! yet_binary; then - eerror "Please try emerging with USE=ghcbootstrap and report build" - eerror "sucess or failure to the haskell team (haskell@gentoo.org)" - die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap" - fi - fi - - if needs_python; then - python-any-r1_pkg_setup - fi - - use llvm && llvm_pkg_setup -} - -src_unpack() { - # Create the ${S} dir if we're using the binary version - use binary && mkdir "${S}" - - # the Solaris and Darwin binaries from ghc (maeder) need to be - # unpacked separately, so prevent them from being unpacked - local ONLYA=${A} - case ${CHOST} in - *-darwin* | *-solaris*) ONLYA=${GHC_P}-src.tar.xz ;; - esac - unpack ${ONLYA} -} - -src_prepare() { - # Force the use of C.utf8 locale - # <https://github.com/gentoo-haskell/gentoo-haskell/issues/1287> - # <https://github.com/gentoo-haskell/gentoo-haskell/issues/1289> - export LC_ALL=C.utf8 - - ghc_setup_cflags - - # ghc-9.0.2 release anomaly - # https://www.mail-archive.com/search?l=ghc-devs@haskell.org&q=subject:%22Re%5C%3A+%5C%5BHaskell%5C%5D+%5C%5BANNOUNCE%5C%5D+GHC+9.0.2+released%22&o=newest&f=1 - # https://src.fedoraproject.org/rpms/ghc9.0/blob/rawhide/f/ghc9.0.spec#_327 - rm -rf "libraries/containers/containers/dist-install" || die - - if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then - # Modify the wrapper script from the binary tarball to use GHC_PERSISTENT_FLAGS. - # See bug #313635. - sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \ - "${WORKDIR}/usr/bin/ghc-${BIN_PV}" - - # allow hardened users use vanilla binary to bootstrap ghc - # ghci uses mmap with rwx protection at it implements dynamic - # linking on it's own (bug #299709) - pax-mark -m "${WORKDIR}/usr/$(get_libdir)/${PN}-${BIN_PV}/bin/ghc" - fi - - use llvm && ! use ghcbootstrap && llvmize "${WORKDIR}/usr/bin" - - # binpkg may have been built with FEATURES=splitdebug - if [[ -d "${WORKDIR}/usr/lib/debug" ]] ; then - rm -rf "${WORKDIR}/usr/lib/debug" || die - fi - find "${WORKDIR}/usr/lib" -type d -empty -delete 2>/dev/null # do not die on failure here - - # ffi headers don't get included in the binpkg for some reason - for f in "${WORKDIR}/usr/$(get_libdir)/${PN}-${BIN_PV}/include/"{ffi.h,ffitarget.h} - do - mkdir -p "$(dirname "${f}")" - [[ -e "${f}" ]] || ln -sf "$($(tc-getPKG_CONFIG) --cflags-only-I libffi | sed "s/-I//g" | tr -d " ")/$(basename "${f}")" "${f}" || die - done - - eapply "${FILESDIR}"/${PN}-9.0.2-sphinx-6.patch - - if use binary; then - if use prefix; then - relocate_ghc "${EPREFIX}" - fi - - # Move unpacked files to the expected place - mv "${WORKDIR}/usr" "${S}" - eapply_user - else - if ! use ghcbootstrap; then - case ${CHOST} in - *-darwin* | *-solaris*) - # UPDATE ME for ghc-7 - mkdir "${WORKDIR}"/ghc-bin-installer || die - pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die - use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2 - popd > /dev/null - - pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die - # fix the binaries so they run, on Solaris we need an - # LD_LIBRARY_PATH which has our prefix libdirs, on - # Darwin we need to replace the frameworks with our libs - # from the prefix fix before installation, because some - # of the tools are actually used during configure/make - if [[ ${CHOST} == *-solaris* ]] ; then - export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}" - elif [[ ${CHOST} == *-darwin* ]] ; then - local readline_framework=GNUreadline.framework/GNUreadline - local gmp_framework=/opt/local/lib/libgmp.10.dylib - local ncurses_file=/opt/local/lib/libncurses.5.dylib - for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do - install_name_tool -change \ - ${readline_framework} \ - "${EPREFIX}"/lib/libreadline.dylib \ - ${binary} || die - install_name_tool -change \ - ${gmp_framework} \ - "${EPREFIX}"/usr/lib/libgmp.dylib \ - ${binary} || die - install_name_tool -change \ - ${ncurses_file} \ - "${EPREFIX}"/usr/lib/libncurses.dylib \ - ${binary} || die - done - # we don't do frameworks! - sed -i \ - -e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \ - -e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \ - rts/package.conf.in || die - fi - - # it is autoconf, but we really don't want to give it too - # many arguments, in fact we do the make in-place anyway - ./configure --prefix="${WORKDIR}"/usr || die - make install || die - popd > /dev/null - ;; - *) - relocate_ghc "${WORKDIR}" - ;; - esac - fi - - sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \ - "${S}/ghc/ghc.wrapper" - - cd "${S}" # otherwise eapply will break - - eapply "${FILESDIR}"/${PN}-9.0.2-CHOST-prefix.patch - eapply "${FILESDIR}"/${PN}-9.0.2-darwin.patch - # Fixes panic when compiling some packages - # https://github.com/gentoo-haskell/gentoo-haskell/issues/1250#issuecomment-1044257595 - # https://gitlab.haskell.org/ghc/ghc/-/issues/21097 - eapply "${FILESDIR}/${PN}-9.0.2-modorigin-semigroup.patch" - # Needed for testing with python-3.10 - use test && eapply "${FILESDIR}/${PN}-9.0.2-fix-tests-python310.patch" - eapply "${FILESDIR}"/${PN}-8.10.1-allow-cross-bootstrap.patch - eapply "${FILESDIR}"/${PN}-9.0.2-disable-unboxed-arrays.patch - eapply "${FILESDIR}"/${PN}-9.0.2-llvm-13.patch - eapply "${FILESDIR}"/${PN}-9.0.2-llvm-14.patch - eapply "${FILESDIR}"/latomic-subword - eapply "${WORKDIR}"/${P}-riscv64-llvm.patch - eapply "${FILESDIR}"/${PN}-9.0.2-fptools.patch # clang-16 workaround - - # mingw32 target - pushd "${S}/libraries/Win32" - eapply "${FILESDIR}"/${PN}-8.2.1_rc1-win32-cross-2-hack.patch # bad workaround - popd - - bump_libs - - eapply_user - # as we have changed the build system - eautoreconf - fi -} - -src_configure() { - if ! use binary; then - # initialize build.mk - echo '# Gentoo changes' > mk/build.mk - - # Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV} - echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk - echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk - - # We also need to use the GHC_FLAGS flags when building ghc itself - echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk - echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk - echo "SRC_LD_OPTS+=${LDFLAGS}" >> mk/build.mk - # Speed up initial Cabal bootstrap - echo "utils/ghc-cabal_dist_EXTRA_HC_OPTS+=$(ghc-make-args)" >> mk/build.mk - - # We can't depend on haddock except when bootstrapping when we - # must build docs and include them into the binary .tbz2 package - # app-text/dblatex is not in portage, can not build PDF or PS - echo "BUILD_SPHINX_PDF = NO" >> mk/build.mk - echo "BUILD_SPHINX_HTML = $(usex doc YES NO)" >> mk/build.mk - echo "BUILD_MAN = $(usex doc YES NO)" >> mk/build.mk - - # this controls presence on 'xhtml' and 'haddock' in final install - echo "HADDOCK_DOCS = YES" >> mk/build.mk - - # not used outside of ghc's test - if [[ -n ${GHC_BUILD_DPH} ]]; then - echo "BUILD_DPH = YES" >> mk/build.mk - else - echo "BUILD_DPH = NO" >> mk/build.mk - fi - - # Any non-native build has to skip as it needs - # target haddock binary to be runnabine. - if ! is_native; then - # disable docs generation as it requires running stage2 - echo "HADDOCK_DOCS=NO" >> mk/build.mk - echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk - echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk - fi - - if is_crosscompile; then - # Install ghc-stage1 crosscompiler instead of - # ghc-stage2 cross-built compiler. - echo "Stage1Only=YES" >> mk/build.mk - fi - - # allows overriding build flavours for libraries: - # v - vanilla (static libs) - # p - profiled - # dyn - shared libraries - # example: GHC_LIBRARY_WAYS="v dyn" - if [[ -n ${GHC_LIBRARY_WAYS} ]]; then - echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk - fi - echo "BUILD_PROF_LIBS = $(usex profile YES NO)" >> mk/build.mk - - # Get ghc from the unpacked binary .tbz2 - # except when bootstrapping we just pick ghc up off the path - if ! use ghcbootstrap; then - export PATH="${WORKDIR}/usr/bin:${PATH}" - fi - - echo "BIGNUM_BACKEND = $(usex gmp gmp native)" >> mk/build.mk - - # don't strip anything. Very useful when stage2 SIGSEGVs on you - echo "STRIP_CMD = :" >> mk/build.mk - - local econf_args=() - - # GHC embeds toolchain it was built by and uses it later. - # Don't allow things like ccache or versioned binary slip. - # We use stable thing across gcc upgrades. - # User can use EXTRA_ECONF=CC=... to override this default. - econf_args+=( - AR=${CTARGET}-ar - CC=${CTARGET}-gcc - # these should be inferred by GHC but ghc defaults - # to using bundled tools on windows. - Windres=${CTARGET}-windres - DllWrap=${CTARGET}-dllwrap - # we set the linker explicitly below - --disable-ld-override - ) - case ${CTARGET} in - arm*) - # ld.bfd-2.28 does not work for ghc. Force ld.gold - # instead. This should be removed once gentoo gets - # a fix for R_ARM_COPY bug: https://sourceware.org/PR16177 - econf_args+=(LD=${CTARGET}-ld.gold) - ;; - sparc*) - # ld.gold-2.28 does not work for ghc. Force ld.bfd - # instead. This should be removed once gentoo gets - # a fix for missing --no-relax support bug: - # https://sourceware.org/ml/binutils/2017-07/msg00183.html - econf_args+=(LD=${CTARGET}-ld.bfd) - ;; - *) - econf_args+=(LD=${CTARGET}-ld) - esac - - if [[ ${CBUILD} != ${CHOST} ]]; then - # GHC bug: ghc claims not to support cross-building. - # It does, but does not distinct --host= value - # for stage1 and stage2 compiler. - econf_args+=(--host=${CBUILD}) - fi - - if use ghcmakebinary; then - # When building booting libary we are trying to - # bundle or restrict most of external depends - # with unstable ABI: - # - embed libffi (default GHC behaviour) - # - disable ncurses support for ghci (via haskeline) - # https://bugs.gentoo.org/557478 - # - disable ncurses support for ghc-pkg - echo "libraries/haskeline_CONFIGURE_OPTS += --flag=-terminfo" >> mk/build.mk - echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk - elif is_native; then - # using ${GTARGET}'s libffi is not supported yet: - # GHC embeds full path for ffi includes without /usr/${CTARGET} account. - econf_args+=(--with-system-libffi) - econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@')) - fi - - einfo "Final mk/build.mk:" - cat mk/build.mk || die - - econf ${econf_args[@]} \ - --enable-bootstrap-with-devel-snapshot \ - $(use_enable elfutils dwarf-unwind) \ - $(use_enable numa) \ - $(use_enable unregisterised) - - if [[ ${PV} == *9999* ]]; then - GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')" - GHC_P=${PN}-${GHC_PV} - fi - fi # ! use binary -} - -src_compile() { - if ! use binary; then - # Stage1Only crosscompiler does not build stage2 - if ! is_crosscompile; then - # 1. build/pax-mark compiler binary first - emake ghc/stage2/build/tmp/ghc-stage2 - # 2. pax-mark (bug #516430) - pax-mark -m ghc/stage2/build/tmp/ghc-stage2 - # 2. build/pax-mark haddock using ghc-stage2 - if is_native; then - # non-native build does not build haddock - # due to HADDOCK_DOCS=NO, but it could. - emake utils/haddock/dist/build/tmp/haddock - pax-mark -m utils/haddock/dist/build/tmp/haddock - fi - fi - # 3. and then all the rest - emake all - fi # ! use binary -} - -src_test() { - # TODO: deal with: - # - sandbox (pollutes environment) - # - extra packages (to extend testsuite coverage) - # bits are taken from 'validate' - local make_test_target='test' # can be fulltest - # not 'emake' as testsuite uses '$MAKE' without jobserver available - make $make_test_target stage=2 THREADS=$(makeopts_jobs) -} - -src_install() { - if use binary; then - use prefix && mkdir -p "${ED}" - mv "${S}/usr" "${ED}" - else - [[ -f VERSION ]] || emake VERSION - - # -j1 due to a rare race in install script: - # make --no-print-directory -f ghc.mk phase=final install - # /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 755 \ - # -d "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404/include" - # /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 644 utils/hsc2hs/template-hsc.h \ - # "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404" - # /usr/bin/install: cannot create regular file \ - # '/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404': No such file or directory - emake -j1 install DESTDIR="${D}" - - use llvm && llvmize "${ED}/usr/bin" - - # Skip for cross-targets as they all share target location: - # /usr/share/doc/ghc-9999/ - if ! is_crosscompile; then - dodoc "distrib/README" "LICENSE" "VERSION" - fi - - # rename ghc-shipped files to avoid collision - # of external packages. Motivating example: - # user had installed: - # dev-lang/ghc-7.8.4-r0 (with transformers-0.3.0.0) - # dev-haskell/transformers-0.4.2.0 - # then user tried to update to - # dev-lang/ghc-7.8.4-r1 (with transformers-0.4.2.0) - # this will lead to single .conf file collision. - local shipped_conf renamed_conf - local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d" - for shipped_conf in "${package_confdir}"/*.conf; do - # rename 'pkg-ver-id.conf' to 'pkg-ver-id-gentoo-${PF}.conf' - renamed_conf=${shipped_conf%.conf}-gentoo-${PF}.conf - mv "${shipped_conf}" "${renamed_conf}" || die - done - - # remove link, but leave 'haddock-${GHC_P}' - rm -f "${ED}"/usr/bin/$(cross)haddock - - if ! is_crosscompile; then - newbashcomp "${FILESDIR}"/ghc-bash-completion ghc-pkg - newbashcomp utils/completion/ghc.bash ghc - fi - fi - - # path to the package.cache - local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d" - PKGCACHE="${package_confdir}"/package.cache - # copy the package.conf.d, including timestamp, save it so we can help - # users that have a broken package.conf.d - cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d" - - # copy the package.conf, including timestamp, save it so we later can put it - # back before uninstalling, or when upgrading. - cp -p "${PKGCACHE}"{,.shipped} \ - || die "failed to copy package.conf.d/package.cache" - - if is_crosscompile; then - # When we build a cross-compiler the layout is the following: - # usr/lib/${CTARGET}-ghc-${VER}/ contains target libraries - # but - # usr/lib/${CTARGET}-ghc-${VER}/bin/ directory - # containst host binaries (modulo bugs). - - # Portage's stripping mechanism does not skip stripping - # foreign binaries. This frequently causes binaries to be - # broken. - # - # Thus below we disable stripping of target libraries and allow - # stripping hosts executables. - dostrip -x "/usr/$(get_libdir)/$(cross)${GHC_P}" - dostrip "/usr/$(get_libdir)/$(cross)${GHC_P}/bin" - fi -} - -pkg_preinst() { - # have we got an earlier version of ghc installed? - if has_version "<${CATEGORY}/${PF}"; then - haskell_updater_warn="1" - fi -} - -pkg_postinst() { - ghc-reregister - - # path to the package.cache - PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache" - - # give the cache a new timestamp, it must be as recent as - # the package.conf.d directory. - touch "${PKGCACHE}" - - if [[ "${haskell_updater_warn}" == "1" ]]; then - ewarn - ewarn "\e[1;31m************************************************************************\e[0m" - ewarn - ewarn "You have just upgraded from an older version of GHC." - ewarn "You may have to run" - ewarn " 'haskell-updater'" - ewarn "to rebuild all ghc-based Haskell libraries." - ewarn - ewarn "\e[1;31m************************************************************************\e[0m" - ewarn - fi -} - -pkg_prerm() { - PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache" - rm -rf "${PKGCACHE}" - - cp -p "${PKGCACHE}"{.shipped,} -} - -pkg_postrm() { - ghc-package_pkg_postrm -} diff --git a/dev-lang/ghc/ghc-9.0.2-r4.ebuild b/dev-lang/ghc/ghc-9.0.2-r4.ebuild index f954a9396acc..140c6cdfed30 100644 --- a/dev-lang/ghc/ghc-9.0.2-r4.ebuild +++ b/dev-lang/ghc/ghc-9.0.2-r4.ebuild @@ -13,7 +13,7 @@ if [[ ${CTARGET} = ${CHOST} ]] ; then fi fi -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit python-any-r1 inherit autotools bash-completion-r1 flag-o-matic ghc-package inherit multiprocessing pax-utils toolchain-funcs prefix @@ -122,7 +122,7 @@ BUMP_LIBRARIES=( LICENSE="BSD" SLOT="0/${PV}" KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="big-endian +doc elfutils ghcbootstrap ghcmakebinary +gmp llvm numa profile test unregisterised" +IUSE="big-endian doc elfutils ghcbootstrap ghcmakebinary +gmp llvm numa profile test unregisterised" IUSE+=" binary" RESTRICT="!test? ( test )" @@ -165,6 +165,7 @@ BDEPEND=" app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx + dev-python/sphinx-rtd-theme >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} ) test? ( ${PYTHON_DEPS} ) @@ -439,7 +440,7 @@ pkg_setup() { else if ! yet_binary; then eerror "Please try emerging with USE=ghcbootstrap and report build" - eerror "sucess or failure to the haskell team (haskell@gentoo.org)" + eerror "success or failure to the haskell team (haskell@gentoo.org)" die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap" fi fi @@ -597,6 +598,22 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-9.0.2-fptools.patch # clang-16 workaround eapply "${FILESDIR}"/${PN}-9.0.2-sphinx-6.patch + # FIXME: A hack that allows dev-python/sphinx-7 to build the docs + # + # GHC has updated the bundled version here: + # <https://gitlab.haskell.org/ghc/ghc/-/commit/70526f5bd8886126f49833ef20604a2c6477780a> + # However, the patch is difficult to apply and our versions of GHC don't + # have the update, so we symlink to the system version instead. + if use doc; then + local python_str="import sphinx_rtd_theme; print(sphinx_rtd_theme.__file__)" + local rtd_theme_dir="$(dirname $("${EPYTHON}" -c "$python_str"))" + local orig_rtd_theme_dir="${S}/docs/users_guide/rtd-theme" + + einfo "Replacing bundled rtd-theme with dev-python/sphinx-rtd-theme" + rm -r "${orig_rtd_theme_dir}" || die + ln -s "${rtd_theme_dir}" "${orig_rtd_theme_dir}" || die + fi + # mingw32 target pushd "${S}/libraries/Win32" eapply "${FILESDIR}"/${PN}-8.2.1_rc1-win32-cross-2-hack.patch # bad workaround @@ -721,7 +738,7 @@ src_configure() { fi if use ghcmakebinary; then - # When building booting libary we are trying to + # When building booting library we are trying to # bundle or restrict most of external depends # with unstable ABI: # - embed libffi (default GHC behaviour) @@ -839,7 +856,7 @@ src_install() { PKGCACHE="${package_confdir}"/package.cache # copy the package.conf.d, including timestamp, save it so we can help # users that have a broken package.conf.d - cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d" + cp -pR "${package_confdir}"{,.initial} || die "failed to backup initial package.conf.d" # copy the package.conf, including timestamp, save it so we later can put it # back before uninstalling, or when upgrading. |