| 1 |
commit: 2a61a86e6a1416fbb57acff2118552fc1d5471c1 |
| 2 |
Author: Matoro Mahri <matoro <AT> users <DOT> noreply <DOT> github <DOT> com> |
| 3 |
AuthorDate: Wed Feb 1 02:27:16 2023 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 1 04:56:59 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a61a86e |
| 7 |
|
| 8 |
dev-lang/ghc: bump maximum LLVM to 14 |
| 9 |
|
| 10 |
Validated on arm64. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/876187 |
| 13 |
Signed-off-by: Matoro Mahri <matoro <AT> users.noreply.github.com> |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/29366 |
| 15 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 16 |
|
| 17 |
dev-lang/ghc/files/ghc-9.0.2-llvm-14.patch | 15 +++++++++++++++ |
| 18 |
dev-lang/ghc/{ghc-9.0.2-r2.ebuild => ghc-9.0.2-r3.ebuild} | 5 +++-- |
| 19 |
2 files changed, 18 insertions(+), 2 deletions(-) |
| 20 |
|
| 21 |
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 |
| 22 |
new file mode 100644 |
| 23 |
index 000000000000..ee4132bb2ee8 |
| 24 |
--- /dev/null |
| 25 |
+++ b/dev-lang/ghc/files/ghc-9.0.2-llvm-14.patch |
| 26 |
@@ -0,0 +1,15 @@ |
| 27 |
+https://bugs.gentoo.org/876187 |
| 28 |
+ |
| 29 |
+Bump max LLVM to 14. Validated on arm64. |
| 30 |
+ |
| 31 |
+--- a/configure.ac |
| 32 |
++++ b/configure.ac |
| 33 |
+@@ -681,7 +681,7 @@ AC_SUBST(InstallNameToolCmd) |
| 34 |
+ # versions of LLVM simultaneously, but that stopped working around |
| 35 |
+ # 3.5/3.6 release of LLVM. |
| 36 |
+ LlvmMinVersion=9 # inclusive |
| 37 |
+-LlvmMaxVersion=14 # not inclusive |
| 38 |
++LlvmMaxVersion=15 # not inclusive |
| 39 |
+ AC_SUBST([LlvmMinVersion]) |
| 40 |
+ AC_SUBST([LlvmMaxVersion]) |
| 41 |
+ sUPPORTED_LLVM_VERSION_MIN=$(echo \($LlvmMinVersion\) | sed 's/\./,/') |
| 42 |
|
| 43 |
diff --git a/dev-lang/ghc/ghc-9.0.2-r2.ebuild b/dev-lang/ghc/ghc-9.0.2-r3.ebuild |
| 44 |
similarity index 99% |
| 45 |
rename from dev-lang/ghc/ghc-9.0.2-r2.ebuild |
| 46 |
rename to dev-lang/ghc/ghc-9.0.2-r3.ebuild |
| 47 |
index 224ca5ec3652..b7d4466a00c3 100644 |
| 48 |
--- a/dev-lang/ghc/ghc-9.0.2-r2.ebuild |
| 49 |
+++ b/dev-lang/ghc/ghc-9.0.2-r3.ebuild |
| 50 |
@@ -85,7 +85,7 @@ IUSE="big-endian +doc elfutils ghcbootstrap ghcmakebinary +gmp llvm numa profile |
| 51 |
IUSE+=" binary" |
| 52 |
RESTRICT="!test? ( test )" |
| 53 |
|
| 54 |
-LLVM_MAX_SLOT="13" |
| 55 |
+LLVM_MAX_SLOT="14" |
| 56 |
RDEPEND=" |
| 57 |
>=dev-lang/perl-5.6.1 |
| 58 |
dev-libs/gmp:0= |
| 59 |
@@ -96,7 +96,7 @@ RDEPEND=" |
| 60 |
llvm? ( |
| 61 |
<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= |
| 62 |
|| ( |
| 63 |
- sys-devel/llvm:13 |
| 64 |
+ sys-devel/llvm:14 |
| 65 |
) |
| 66 |
) |
| 67 |
" |
| 68 |
@@ -540,6 +540,7 @@ src_prepare() { |
| 69 |
eapply "${FILESDIR}"/${PN}-8.10.1-allow-cross-bootstrap.patch |
| 70 |
eapply "${FILESDIR}"/${PN}-9.0.2-disable-unboxed-arrays.patch |
| 71 |
eapply "${FILESDIR}"/${PN}-9.0.2-llvm-13.patch |
| 72 |
+ eapply "${FILESDIR}"/${PN}-9.0.2-llvm-14.patch |
| 73 |
eapply "${FILESDIR}"/latomic-subword |
| 74 |
eapply "${WORKDIR}"/${P}-riscv64-llvm.patch |
| 75 |
eapply "${FILESDIR}"/${PN}-9.0.2-fptools.patch # clang-16 workaround |
Archives