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

Collapse All | Expand All

(-)a/eclass/toolchain.eclass (-5 / +14 lines)
Lines 166-172 if in_iuse ada; then Link Here
166
	# A newer version of GNAT should build an older version, just not vice-versa. 4.9 can definitely build 5.1.0.
166
	# A newer version of GNAT should build an older version, just not vice-versa. 4.9 can definitely build 5.1.0.
167
	#
167
	#
168
	# TODO: Add support for bootstraps for 5.4.0 and 6.3.0
168
	# TODO: Add support for bootstraps for 5.4.0 and 6.3.0
169
	GNAT_BOOTSTRAP_VERSION="4.9"
169
	tc_version_is_at_least 4.9 && GNAT_BOOTSTRAP_VERSION="4.9"
170
	tc_version_is_at_least 5.0 && GNAT_BOOTSTRAP_VERSION="5.4"
171
	tc_version_is_at_least 6.0 && GNAT_BOOTSTRAP_VERSION="6.3"
170
fi
172
fi
171
173
172
#---->> DEPEND <<----
174
#---->> DEPEND <<----
Lines 329-335 get_gcc_src_uri() { Link Here
329
	elif [[ -n ${SNAPSHOT} ]] ; then
331
	elif [[ -n ${SNAPSHOT} ]] ; then
330
		GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.bz2"
332
		GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.bz2"
331
	else
333
	else
332
		GCC_SRC_URI="mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_RELEASE_VER}.tar.bz2"
334
		if tc_version_is_between 5.5 6 || tc_version_is_between 6.4 7 || tc_version_is_at_least 7.2 ; then
335
			GCC_SRC_URI="mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_RELEASE_VER}.tar.xz"
336
		else
337
			GCC_SRC_URI="mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_RELEASE_VER}.tar.bz2"
338
		fi
333
		# we want all branch updates to be against the main release
339
		# we want all branch updates to be against the main release
334
		[[ -n ${BRANCH_UPDATE} ]] && \
340
		[[ -n ${BRANCH_UPDATE} ]] && \
335
			GCC_SRC_URI+=" $(gentoo_urls gcc-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2)"
341
			GCC_SRC_URI+=" $(gentoo_urls gcc-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2)"
Lines 370-376 get_gcc_src_uri() { Link Here
370
		fi
376
		fi
371
	fi
377
	fi
372
378
373
	# TODO: Add support for bootstraps for 5.4.0 and 6.3.0
379
	# TODO: Add support for bootstraps for 5.4.0 and 6.3.0 for i686/arm/other arches.
374
	if in_iuse ada; then
380
	if in_iuse ada; then
375
		GCC_SRC_URI+=" amd64? ( https://dev.gentoo.org/~nerdboy/files/gnatboot-${GNAT_BOOTSTRAP_VERSION}-amd64.tar.xz )
381
		GCC_SRC_URI+=" amd64? ( https://dev.gentoo.org/~nerdboy/files/gnatboot-${GNAT_BOOTSTRAP_VERSION}-amd64.tar.xz )
376
				x86?   ( https://dev.gentoo.org/~nerdboy/files/gnatboot-${GNAT_BOOTSTRAP_VERSION}-i686.tar.xz )
382
				x86?   ( https://dev.gentoo.org/~nerdboy/files/gnatboot-${GNAT_BOOTSTRAP_VERSION}-i686.tar.xz )
Lines 460-466 gcc_quick_unpack() { Link Here
460
	elif [[ -n ${SNAPSHOT} ]] ; then
466
	elif [[ -n ${SNAPSHOT} ]] ; then
461
		unpack gcc-${SNAPSHOT}.tar.bz2
467
		unpack gcc-${SNAPSHOT}.tar.bz2
462
	elif [[ ${PV} != *9999* ]] ; then
468
	elif [[ ${PV} != *9999* ]] ; then
463
		unpack gcc-${GCC_RELEASE_VER}.tar.bz2
469
		if tc_version_is_between 5.5 6 || tc_version_is_between 6.4 7 || tc_version_is_at_least 7.2 ; then
470
			unpack gcc-${GCC_RELEASE_VER}.tar.xz
471
		else
472
			unpack gcc-${GCC_RELEASE_VER}.tar.bz2
473
		fi
464
		# We want branch updates to be against a release tarball
474
		# We want branch updates to be against a release tarball
465
		if [[ -n ${BRANCH_UPDATE} ]] ; then
475
		if [[ -n ${BRANCH_UPDATE} ]] ; then
466
			pushd "${S}" > /dev/null
476
			pushd "${S}" > /dev/null
467
- 

Return to bug 592060