Skip to content

GitLab

Commit 03bf8a42 authored by James T. Lee's avatar James T. Lee
Browse files

ghc: Try building with LLVM 11

parent 5603dac3
Pipeline #633 passed with stage
in 21 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
dev-lang/ghc/Manifest
View file @ 03bf8a42
...@@ -76,4 +76,4 @@ DIST ghc-bin-8.10.4-i686-pc-linux-gnu.tbz2 123831294 BLAKE2B 1ca4c1b5c34c9480110 ...@@ -76,4 +76,4 @@ DIST ghc-bin-8.10.4-i686-pc-linux-gnu.tbz2 123831294 BLAKE2B 1ca4c1b5c34c9480110
DIST ghc-bin-8.10.4-x86_64-pc-linux-gnu.tbz2 122558873 BLAKE2B 9f07c7bdc3beccfa629d28b2524ccd2f4688a5c0036a45408f5ace2d530a2a0e42f95b3cda5037ebb365317999e1ae776c6f9d21692867abfe85e33f2892b1be SHA512 68bd70f94961547746a696aa2839e156c95858fda0c7ec5b2ecf802070724ab7102b0aa86bcbf93432170d521cce4af10f46b851b470e5dc49dfa5b07380f46d DIST ghc-bin-8.10.4-x86_64-pc-linux-gnu.tbz2 122558873 BLAKE2B 9f07c7bdc3beccfa629d28b2524ccd2f4688a5c0036a45408f5ace2d530a2a0e42f95b3cda5037ebb365317999e1ae776c6f9d21692867abfe85e33f2892b1be SHA512 68bd70f94961547746a696aa2839e156c95858fda0c7ec5b2ecf802070724ab7102b0aa86bcbf93432170d521cce4af10f46b851b470e5dc49dfa5b07380f46d
EBUILD ghc-8.10.2.ebuild 26420 BLAKE2B ea060722136a7696cff6b78bfd1c4dd3c3c246d0660fef2d452349b04329f231abce7464de99b15eb4a0facbe06f970fd72a989690f204d0e914454b3d97b106 SHA512 add4cfd1c15e1cc1c0a12b73198bdd17b48264938f2b3c62c679daf397010f50074a8e96d5419cbe5e491b8694e609cb10174766ed67276ca74a4795b3ea0339 EBUILD ghc-8.10.2.ebuild 26420 BLAKE2B ea060722136a7696cff6b78bfd1c4dd3c3c246d0660fef2d452349b04329f231abce7464de99b15eb4a0facbe06f970fd72a989690f204d0e914454b3d97b106 SHA512 add4cfd1c15e1cc1c0a12b73198bdd17b48264938f2b3c62c679daf397010f50074a8e96d5419cbe5e491b8694e609cb10174766ed67276ca74a4795b3ea0339
EBUILD ghc-8.10.3.ebuild 26390 BLAKE2B 76b4fc5e2bba922e9cc757235a6186cc55f864136b98d4cc91e8e06339e86e1f9846a7f5a7762d78feb79e986457ad1c581ee1d5b4e592d15b9e00be4bac0b9a SHA512 541b085c26cf5ccd90771f9322a259aad0354e566c1ffda48a2a9fce7d8832c84c7789309a8d3d6a60ab4acd38fdffe7e4ba57e3a492c76af79c9a11f26274ba EBUILD ghc-8.10.3.ebuild 26390 BLAKE2B 76b4fc5e2bba922e9cc757235a6186cc55f864136b98d4cc91e8e06339e86e1f9846a7f5a7762d78feb79e986457ad1c581ee1d5b4e592d15b9e00be4bac0b9a SHA512 541b085c26cf5ccd90771f9322a259aad0354e566c1ffda48a2a9fce7d8832c84c7789309a8d3d6a60ab4acd38fdffe7e4ba57e3a492c76af79c9a11f26274ba
EBUILD ghc-8.10.4.ebuild 26401 BLAKE2B 2806ca15b41d5f5a99fe3c42572d5f7c43a48af95a9a4a29270efe7c1df1a1cf71b63eac723b05fcefc75700a0c5bafd75f5feec675529ca786aa463ab287a1f SHA512 f2fbb2b51257b403434ebeb91e225105bd2afdcada2ae5f47e7809f09e5cc2bb15e2f224b901c9b90ff40b6e38bcf67e6f338bb994491a6e32707b11d49e2d1d EBUILD ghc-8.10.4.ebuild 26485 BLAKE2B 4866c60f7209485ab79fe26b1d3133254355f1e4b9ea500332a8edebb3e9c1d3c482a252b14bdeb1a5a64e72b100487dd06385f3456c0a2ce059345692a5d064 SHA512 6748088b699dda935513a3fa5e2c70492dff153cfebc59e7823ddeb54e1b84f9bafca8f46a6ff06858dbb51a10cda5908ffc8fa7140cfab0ed02df4dee3f6e39
dev-lang/ghc/ghc-8.10.4.ebuild
View file @ 03bf8a42
...@@ -108,7 +108,7 @@ RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )" ...@@ -108,7 +108,7 @@ RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
# On arm ghc requires llvm backend. # On arm ghc requires llvm backend.
# On ghc-8.11 does not support anything except llvm-9 today. # On ghc-8.11 does not support anything except llvm-9 today.
# See 'configure.ac:LlvmVersion=9' handling. # See 'configure.ac:LlvmVersion=9' handling.
LLVM_MAX_SLOT=9 LLVM_MAX_SLOT=11
RDEPEND+=" RDEPEND+="
llvm? ( sys-devel/llvm:${LLVM_MAX_SLOT} ) llvm? ( sys-devel/llvm:${LLVM_MAX_SLOT} )
...@@ -248,7 +248,7 @@ ghc_setup_cflags() { ...@@ -248,7 +248,7 @@ ghc_setup_cflags() {
# Cmm can't parse line numbers #482086 # Cmm can't parse line numbers #482086
replace-flags -ggdb[3-9] -ggdb2 replace-flags -ggdb[3-9] -ggdb2
GHC_FLAGS="-optlc-O1" GHC_FLAGS=""
GHC_PERSISTENT_FLAGS="" GHC_PERSISTENT_FLAGS=""
for flag in ${CFLAGS}; do for flag in ${CFLAGS}; do
case ${flag} in case ${flag} in
...@@ -498,6 +498,9 @@ src_prepare() { ...@@ -498,6 +498,9 @@ src_prepare() {
sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \ sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
"${S}/ghc/ghc.wrapper" "${S}/ghc/ghc.wrapper"
sed -i -e "s/^LlvmVersion=[0-9]*/LlvmVersion=${LLVM_MAX_SLOT}/" \
"${S}/configure.ac"
cd "${S}" # otherwise eapply will break cd "${S}" # otherwise eapply will break
eapply "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch eapply "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment