Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 622786 | Differences between
and this patch

Collapse All | Expand All

(-)ghc-8.10.6.ebuild.orig (-2 / +13 lines)
Lines 3-8 Link Here
3
3
4
EAPI=7
4
EAPI=7
5
5
6
inherit llvm
7
6
# to make make a crosscompiler use crossdev and symlink ghc tree into
8
# to make make a crosscompiler use crossdev and symlink ghc tree into
7
# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc'
9
# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc'
8
export CBUILD=${CBUILD:-${CHOST}}
10
export CBUILD=${CBUILD:-${CHOST}}
Lines 86-93 Link Here
86
	elfutils? ( dev-libs/elfutils )
88
	elfutils? ( dev-libs/elfutils )
87
	!ghcmakebinary? ( dev-libs/libffi:= )
89
	!ghcmakebinary? ( dev-libs/libffi:= )
88
	numa? ( sys-process/numactl )
90
	numa? ( sys-process/numactl )
91
	arm? (
92
		<sys-devel/llvm-13:=
93
		|| ( sys-devel/llvm:11 sys-devel/llvm:12 )
94
	)
89
"
95
"
90
96
97
LLVM_MAX_SLOT=12
98
91
# This set of dependencies is needed to run
99
# This set of dependencies is needed to run
92
# prebuilt ghc. We specifically avoid ncurses
100
# prebuilt ghc. We specifically avoid ncurses
93
# dependency with:
101
# dependency with:
Lines 370-375 Link Here
370
pkg_setup() {
378
pkg_setup() {
371
	ghc-check-reqs check-reqs_pkg_setup
379
	ghc-check-reqs check-reqs_pkg_setup
372
380
381
	llvm_pkg_setup
382
373
	# quiet portage about prebuilt binaries
383
	# quiet portage about prebuilt binaries
374
	use binary && QA_PREBUILT="*"
384
	use binary && QA_PREBUILT="*"
375
385
Lines 600-613 Link Here
600
			Windres=${CTARGET}-windres
610
			Windres=${CTARGET}-windres
601
			DllWrap=${CTARGET}-dllwrap
611
			DllWrap=${CTARGET}-dllwrap
602
			# we set the linker explicitly below
612
			# we set the linker explicitly below
603
			--disable-ld-override
613
#			--disable-ld-override
604
		)
614
		)
605
		case ${CTARGET} in
615
		case ${CTARGET} in
606
			arm*)
616
			arm*)
607
				# ld.bfd-2.28 does not work for ghc. Force ld.gold
617
				# ld.bfd-2.28 does not work for ghc. Force ld.gold
608
				# instead. This should be removed once gentoo gets
618
				# instead. This should be removed once gentoo gets
609
				# a fix for R_ARM_COPY bug: https://sourceware.org/PR16177
619
				# a fix for R_ARM_COPY bug: https://sourceware.org/PR16177
610
				econf_args+=(LD=${CTARGET}-ld.gold)
620
#				econf_args+=(LD=${CTARGET}-ld.gold)
621
				econf_args+=("LLC=$(command -v llc)" OPT="$(command -v opt)")
611
			;;
622
			;;
612
			sparc*)
623
			sparc*)
613
				# ld.gold-2.28 does not work for ghc. Force ld.bfd
624
				# ld.gold-2.28 does not work for ghc. Force ld.bfd

Return to bug 622786