summaryrefslogtreecommitdiff
path: root/dev-lang
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-02-01 09:04:22 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-02-01 09:04:22 +0000
commitd88834e7a12432c4e2d04ca7e938a66e25811f89 (patch)
tree9e31e0c72268908e8433ccfd6384a039525c1a32 /dev-lang
parent7414e061f0ef8e77eaa6de051a83181cddbef1dc (diff)
gentoo auto-resync : 01:02:2023 - 09:04:21
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/Manifest.gzbin19526 -> 19525 bytes
-rw-r--r--dev-lang/ghc/Manifest3
-rw-r--r--dev-lang/ghc/files/ghc-9.0.2-llvm-14.patch15
-rw-r--r--dev-lang/ghc/ghc-9.0.2-r3.ebuild (renamed from dev-lang/ghc/ghc-9.0.2-r2.ebuild)5
4 files changed, 20 insertions, 3 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 73df9a2f2447..cd9be5390642 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
Binary files differ
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index acf06ec526e9..8d3d92d8bb37 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -13,6 +13,7 @@ AUX ghc-9.0.2-disable-unboxed-arrays.patch 1298 BLAKE2B d3d8cf5b8f7f012cb93f6481
AUX ghc-9.0.2-fix-tests-python310.patch 1116 BLAKE2B fc7a7390cbbc737c66ea8401c9211318d078499bfd103f07ec2df0db9824041dfee279e364601a21d4d37a694a9442f3570c0333b2baab6173d6daa366c931da SHA512 0620ebffc49a06a65bd45bf324de4674b98e874291e6bebae1a95d585bbdf38cc201a734f7f20133880b46e9abf0839b59278688b00c892b94091d1c0257352b
AUX ghc-9.0.2-fptools.patch 711 BLAKE2B b529444c270fea04b27e57ccd5a758ecb5889cf2b25a5f47930d0fda67fa415c5d960c3c5dfe55970c6ecbb0a136b80e5c741bb0245e120c2d1b7a464379607d SHA512 f898eebaf25c121f075b6c9c531a8b3879b6c025043cfea2d4e416b12220d3fe5898cb0595a7ab92ce46ecb791ede28484c6bd738737aa24a3a0e91d767fdc97
AUX ghc-9.0.2-llvm-13.patch 988 BLAKE2B dee0a02ffb7b79981981615e7933f5ba3348f700794dac1a34fa71987ab9d267af9a79a40db7d66f6bf6ffdb26bed57bdd7dc157f3f27efa296c4152b8e81070 SHA512 a20213400f48882e8c8521a950088fa9dcbfe7cc2ae678d76fd6f1298f019dae9ed334f03050116527554d9ada60b649694d6674a914ce48fa1b5bbf918aa712
+AUX ghc-9.0.2-llvm-14.patch 487 BLAKE2B 884dc20e80bd5a0ec9c85833253ca48816e3cf719854ddb58d67cc11fb2eb4583d7b76f93977ccaa28dcbb3fa5ca416122b92f1e486f17529f7c46ac8e659ea0 SHA512 8cf67272181f507ed4263fdb4fb26bf5f1f1b9359ab4e1158af50ab89a82d37cc632873124700034805ae62eaa12efcfbe74a99ee16cbc1b5c653025b8333a8c
AUX ghc-9.0.2-modorigin-semigroup.patch 1210 BLAKE2B e29917dd740bded98257366ca37d3ac8fdc8ffd0e988e6286b8cf21fb9f0232ce1584a1a22665f4afad36e5585c29091040cac16b1204022f5a5f3328420c4ff SHA512 dc54fb02dfed55f5a9309c61ec23859ad4f80fd271fe0ccb41b786fc7d44bc0d9722069e2f56731c6af5ad1703c5081ba9e4b4e683911af4ad9b498f53b67a5e
AUX ghc-bash-completion 6496 BLAKE2B dc94a1979e886026a2fbe04bf7b45718ffa3e025a0e8945262e21a1243bfce6517fa1794f2ba6cd54cc853e93ad5d80472b9019b95762f10b5be83634a479955 SHA512 ede79ccf23555f60f48297d29bd98e3ccfd67d2cf27462153e00beb930398cb497e34ba8316e91df44c577ed11fdbe5606f7c6a2777e35d5e783590e49ccfeb5
AUX latomic-subword 2886 BLAKE2B 97c6fb8d055e2ae4abf366f9f0e255588ca2f61f189d9356c5d0e6ff0dd7e7f10676469c72c02d1bd1bc10e5329bc31056670d2ddf03d6e65ae3ff1a5b4cb561 SHA512 8e7e261211ce4cc9baf855ca7b9a289b07fdda27b9738434c42374f9381429fa5798fd15f9cfeb50cc17839a8b8d3634653b72dc8ae9bb5970cf88d35553516c
@@ -30,5 +31,5 @@ DIST ghc-bin-9.0.2-powerpc64le-unknown-linux-gnu.tar.gz 275226316 BLAKE2B 10ade2
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
EBUILD ghc-8.10.6-r2.ebuild 26359 BLAKE2B c81305dbb761361d63dff6ff8d040632f5f0be5c2f9d0bf8406211321332888f232a377a081625bd19163d228d388aa42ccefe286e61cd8e82ea1255be6546ef SHA512 1e22cfa9a22ee3f28f825ef342ac69574dab3c2cda262a39ad369da08735000556ac5d5510f7b6d15d7fecbb0a261bc386e88d217162853e460c0e0053b1f1ff
-EBUILD ghc-9.0.2-r2.ebuild 27728 BLAKE2B b63102fb73bb0cd10e3eec9d6f37c513035faa3ab37b3a68a7ba73670a41691570a07b94a3a120a0ec0e7d81371e4758053fe34f03a22578ac685042f8908b8e SHA512 86fad384650abea74d37b1d3c299afb51a83e053fb49f51b671471e1a40a08438b28028dc3af4e702df9a4b9ab42dfab999ffea0a5175441e4ac58ac700435b3
+EBUILD ghc-9.0.2-r3.ebuild 27777 BLAKE2B e49867f633e62e8cc176e93c95423f54e8fad1a95cc39791c8af9768cb3fc91dbf2521381e8b6847e6c3fe8d20e21bd8872ccc49a22af8c84f7364f9bfbecd50 SHA512 80ae819d851956a6a7d65164c7cd49e37349f305f683a06bb26464e27ae24aeacf0d0ee55d08d2628d867b2e21914e68e76155637b00a758a54a001430752b7e
MISC metadata.xml 1172 BLAKE2B 88b5e4af0e8c0e3335185f2c5469837a43ee87e6fc598242f29aced9bb8a3c330139978c564eb4ca503101934917e8406e9400dffd2eeaf7cd9983e8dc96105e SHA512 b03bb932efa54be0d55be591850064fcc967c8d77afdded255be91794544d47bdbbbd2959103cb739f6ec57b8571a955352e965ee1540a9854235a963b218bd3
diff --git a/dev-lang/ghc/files/ghc-9.0.2-llvm-14.patch b/dev-lang/ghc/files/ghc-9.0.2-llvm-14.patch
new file mode 100644
index 000000000000..ee4132bb2ee8
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-9.0.2-llvm-14.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/876187
+
+Bump max LLVM to 14. Validated on arm64.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -681,7 +681,7 @@ AC_SUBST(InstallNameToolCmd)
+ # versions of LLVM simultaneously, but that stopped working around
+ # 3.5/3.6 release of LLVM.
+ LlvmMinVersion=9 # inclusive
+-LlvmMaxVersion=14 # not inclusive
++LlvmMaxVersion=15 # not inclusive
+ AC_SUBST([LlvmMinVersion])
+ AC_SUBST([LlvmMaxVersion])
+ sUPPORTED_LLVM_VERSION_MIN=$(echo \($LlvmMinVersion\) | sed 's/\./,/')
diff --git a/dev-lang/ghc/ghc-9.0.2-r2.ebuild b/dev-lang/ghc/ghc-9.0.2-r3.ebuild
index 224ca5ec3652..b7d4466a00c3 100644
--- a/dev-lang/ghc/ghc-9.0.2-r2.ebuild
+++ b/dev-lang/ghc/ghc-9.0.2-r3.ebuild
@@ -85,7 +85,7 @@ IUSE="big-endian +doc elfutils ghcbootstrap ghcmakebinary +gmp llvm numa profile
IUSE+=" binary"
RESTRICT="!test? ( test )"
-LLVM_MAX_SLOT="13"
+LLVM_MAX_SLOT="14"
RDEPEND="
>=dev-lang/perl-5.6.1
dev-libs/gmp:0=
@@ -96,7 +96,7 @@ RDEPEND="
llvm? (
<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=
|| (
- sys-devel/llvm:13
+ sys-devel/llvm:14
)
)
"
@@ -540,6 +540,7 @@ src_prepare() {
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