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

(-)toolchain.eclass (-10 / +10 lines)
Lines 1546-1552 Link Here
1546
	emake \
1546
	emake \
1547
		LDFLAGS="${LDFLAGS}" \
1547
		LDFLAGS="${LDFLAGS}" \
1548
		STAGE1_CFLAGS="${STAGE1_CFLAGS}" \
1548
		STAGE1_CFLAGS="${STAGE1_CFLAGS}" \
1549
		LIBPATH="${LIBPATH}" \
1549
		LIBPATH="${EPREFIX}${LIBPATH}" \
1550
		BOOT_CFLAGS="${BOOT_CFLAGS}" \
1550
		BOOT_CFLAGS="${BOOT_CFLAGS}" \
1551
		${GCC_MAKE_TARGET} \
1551
		${GCC_MAKE_TARGET} \
1552
		|| die "emake failed with ${GCC_MAKE_TARGET}"
1552
		|| die "emake failed with ${GCC_MAKE_TARGET}"
Lines 1725-1736 Link Here
1725
	emake -j1 \
1725
	emake -j1 \
1726
		DESTDIR="${D}" \
1726
		DESTDIR="${D}" \
1727
		prefix=${PREFIX} \
1727
		prefix=${PREFIX} \
1728
		bindir=${BINPATH} \
1728
		bindir=${EPREFIX}${BINPATH} \
1729
		includedir=${LIBPATH}/include \
1729
		includedir=${EPREFIX}${LIBPATH}/include \
1730
		datadir=${DATAPATH} \
1730
		datadir=${EPREFIX}${DATAPATH} \
1731
		mandir=${DATAPATH}/man \
1731
		mandir=${EPREFIX}${DATAPATH}/man \
1732
		infodir=${DATAPATH}/info \
1732
		infodir=${EPREFIX}${DATAPATH}/info \
1733
		LIBPATH="${LIBPATH}" \
1733
		LIBPATH="${EPREFIX}${LIBPATH}" \
1734
		${GCC_INSTALL_TARGET} || die
1734
		${GCC_INSTALL_TARGET} || die
1735
1735
1736
	if [[ ${GCC_LIB_COMPAT_ONLY} == "true" ]] ; then
1736
	if [[ ${GCC_LIB_COMPAT_ONLY} == "true" ]] ; then
Lines 1968-1974 Link Here
1968
	# SLOT up libgcj.pc (and let gcc-config worry about links)
1968
	# SLOT up libgcj.pc (and let gcc-config worry about links)
1969
	local libgcj=$(find "${ED}"${PREFIX}/lib/pkgconfig/ -name 'libgcj*.pc')
1969
	local libgcj=$(find "${ED}"${PREFIX}/lib/pkgconfig/ -name 'libgcj*.pc')
1970
	if [[ -n ${libgcj} ]] ; then
1970
	if [[ -n ${libgcj} ]] ; then
1971
		sed -i "/^libdir=/s:=.*:=${LIBPATH}:" "${libgcj}"
1971
		sed -i "/^libdir=/s:=.*:=${EPREFIX}${LIBPATH}:" "${libgcj}"
1972
		mv "${libgcj}" "${ED}"/usr/lib/pkgconfig/libgcj-${GCC_PV}.pc || die
1972
		mv "${libgcj}" "${ED}"/usr/lib/pkgconfig/libgcj-${GCC_PV}.pc || die
1973
	fi
1973
	fi
1974
1974
Lines 2551-2560 Link Here
2551
	allarchives="\(${allarchives// /\\|}\)"
2551
	allarchives="\(${allarchives// /\\|}\)"
2552
2552
2553
	sed -i \
2553
	sed -i \
2554
		-e "/^libdir=/s:=.*:='${dir}':" \
2554
		-e "/^libdir=/s:=.*:='${EPREFIX}${dir##/}':" \
2555
		./${dir}/*.la
2555
		./${dir}/*.la
2556
	sed -i \
2556
	sed -i \
2557
		-e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g" \
2557
		-e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${EPREFIX}${LIBPATH##/}/\1:g" \
2558
		$(find ./${PREFIX}/lib* -maxdepth 3 -name '*.la') \
2558
		$(find ./${PREFIX}/lib* -maxdepth 3 -name '*.la') \
2559
		./${dir}/*.la
2559
		./${dir}/*.la
2560
2560

Return to bug 262199