Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 48136
Collapse All | Expand All

(-)toolchain.eclass.orig (+31 lines)
Lines 2-7 Link Here
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.250 2006/03/10 00:46:18 vapier Exp $
3
# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.250 2006/03/10 00:46:18 vapier Exp $
4
4
5
# Maybe this should go in gcc-*.ebuild instead, but
6
# the overlay is smaller this way:
7
GDC_VER="0.17"
8
5
HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
9
HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
6
LICENSE="GPL-2 LGPL-2.1"
10
LICENSE="GPL-2 LGPL-2.1"
7
RESTRICT="nostrip" # cross-compilers need controlled stripping
11
RESTRICT="nostrip" # cross-compilers need controlled stripping
Lines 136-141 Link Here
136
140
137
	if [[ ${PN} != "kgcc64" ]] ; then
141
	if [[ ${PN} != "kgcc64" ]] ; then
138
		IUSE="${IUSE} altivec bootstrap build fortran gcj gtk hardened multilib nls nocxx objc vanilla"
142
		IUSE="${IUSE} altivec bootstrap build fortran gcj gtk hardened multilib nls nocxx objc vanilla"
143
		[[ -n ${GDC_VER}    ]] && IUSE="${IUSE} dlang"
139
		[[ -n ${PIE_VER}    ]] && IUSE="${IUSE} nopie"
144
		[[ -n ${PIE_VER}    ]] && IUSE="${IUSE} nopie"
140
		[[ -n ${PP_VER}     ]] && IUSE="${IUSE} nossp"
145
		[[ -n ${PP_VER}     ]] && IUSE="${IUSE} nossp"
141
		[[ -n ${HTB_VER}    ]] && IUSE="${IUSE} boundschecking"
146
		[[ -n ${HTB_VER}    ]] && IUSE="${IUSE} boundschecking"
Lines 334-339 Link Here
334
			)"
339
			)"
335
	fi
340
	fi
336
341
342
	# D language frontend
343
	if [[ -n ${GDC_VER} ]] ; then
344
		GCC_SRC_URI="${GCC_SRC_URI}
345
			dlang? (
346
				http://home.earthlink.net/~dvdfrdmn/d/gdc-${GDC_VER}.tar.bz2
347
			)"
348
	fi
349
337
	echo "${GCC_SRC_URI}"
350
	echo "${GCC_SRC_URI}"
338
}
351
}
339
S=$(gcc_get_s_dir)
352
S=$(gcc_get_s_dir)
Lines 1014-1019 Link Here
1014
1027
1015
	${ETYPE}_src_unpack || die "failed to ${ETYPE}_src_unpack"
1028
	${ETYPE}_src_unpack || die "failed to ${ETYPE}_src_unpack"
1016
1029
1030
	if use dlang ; then 
1031
		einfo "Unpacking GDC ${GDC_VER} ..."
1032
		tar -xf "${DISTDIR}"/gdc-${GDC_VER}.tar.bz2 -C gcc
1033
	fi
1034
1017
	fix_files=""
1035
	fix_files=""
1018
	for x in contrib/test_summary libstdc++-v3/scripts/check_survey.in ; do
1036
	for x in contrib/test_summary libstdc++-v3/scripts/check_survey.in ; do
1019
		[[ -e ${x} ]] && fix_files="${fix_files} ${x}"
1037
		[[ -e ${x} ]] && fix_files="${fix_files} ${x}"
Lines 1123-1128 Link Here
1123
	esac
1141
	esac
1124
1142
1125
	GCC_LANG="c"
1143
	GCC_LANG="c"
1144
	is_dlang && GCC_LANG="${GCC_LANG},d"
1126
	is_cxx && GCC_LANG="${GCC_LANG},c++"
1145
	is_cxx && GCC_LANG="${GCC_LANG},c++"
1127
	is_gcj && GCC_LANG="${GCC_LANG},java"
1146
	is_gcj && GCC_LANG="${GCC_LANG},java"
1128
	if is_objc || is_objcxx ; then
1147
	if is_objc || is_objcxx ; then
Lines 1469-1474 Link Here
1469
	[[ ! -x /usr/bin/perl ]] && [[ -n ${MAN_VER} ]] && \
1488
	[[ ! -x /usr/bin/perl ]] && [[ -n ${MAN_VER} ]] && \
1470
		unpack gcc-${MAN_VER}-manpages.tar.bz2
1489
		unpack gcc-${MAN_VER}-manpages.tar.bz2
1471
1490
1491
	if use dlang ; then
1492
		einfo "Setting up GDC ${GDC_VER} ..."
1493
		cd ${S}
1494
		./gcc/d/setup-gcc.sh || die
1495
	fi
1496
1472
	einfo "Configuring ${PN} ..."
1497
	einfo "Configuring ${PN} ..."
1473
	gcc_do_configure
1498
	gcc_do_configure
1474
1499
Lines 2214-2219 Link Here
2214
#	[[ " ${TOOLCHAIN_ALLOWED_LANGS} " != " "*$1*" " ]] 
2239
#	[[ " ${TOOLCHAIN_ALLOWED_LANGS} " != " "*$1*" " ]] 
2215
}
2240
}
2216
2241
2242
is_dlang() {
2243
	gcc-lang-supported 'd' || return 1
2244
	use build && return 1
2245
	use dlang
2246
}
2247
2217
is_cxx() {
2248
is_cxx() {
2218
	gcc-lang-supported 'c++' || return 1
2249
	gcc-lang-supported 'c++' || return 1
2219
	is_allowed 'c++' || return 1
2250
	is_allowed 'c++' || return 1

Return to bug 48136