[patch] patch potentially fixing this issue

prefix-bug262199.patch (text/plain), 1.75 KB, created by Michael Haubenwallner (RETIRED) on 2009-04-01 15:10:43 UTC

Index: toolchain.eclass
===================================================================
--- toolchain.eclass	(revision 40488)
+++ toolchain.eclass	(working copy)
@@ -1546,7 +1546,7 @@
 	emake \
 		LDFLAGS="${LDFLAGS}" \
 		STAGE1_CFLAGS="${STAGE1_CFLAGS}" \
-		LIBPATH="${LIBPATH}" \
+		LIBPATH="${EPREFIX}${LIBPATH}" \
 		BOOT_CFLAGS="${BOOT_CFLAGS}" \
 		${GCC_MAKE_TARGET} \
 		|| die "emake failed with ${GCC_MAKE_TARGET}"
@@ -1725,12 +1725,12 @@
 	emake -j1 \
 		DESTDIR="${D}" \
 		prefix=${PREFIX} \
-		bindir=${BINPATH} \
-		includedir=${LIBPATH}/include \
-		datadir=${DATAPATH} \
-		mandir=${DATAPATH}/man \
-		infodir=${DATAPATH}/info \
-		LIBPATH="${LIBPATH}" \
+		bindir=${EPREFIX}${BINPATH} \
+		includedir=${EPREFIX}${LIBPATH}/include \
+		datadir=${EPREFIX}${DATAPATH} \
+		mandir=${EPREFIX}${DATAPATH}/man \
+		infodir=${EPREFIX}${DATAPATH}/info \
+		LIBPATH="${EPREFIX}${LIBPATH}" \
 		${GCC_INSTALL_TARGET} || die
 
 	if [[ ${GCC_LIB_COMPAT_ONLY} == "true" ]] ; then
@@ -1968,7 +1968,7 @@
 	# SLOT up libgcj.pc (and let gcc-config worry about links)
 	local libgcj=$(find "${ED}"${PREFIX}/lib/pkgconfig/ -name 'libgcj*.pc')
 	if [[ -n ${libgcj} ]] ; then
-		sed -i "/^libdir=/s:=.*:=${LIBPATH}:" "${libgcj}"
+		sed -i "/^libdir=/s:=.*:=${EPREFIX}${LIBPATH}:" "${libgcj}"
 		mv "${libgcj}" "${ED}"/usr/lib/pkgconfig/libgcj-${GCC_PV}.pc || die
 	fi
 
@@ -2551,10 +2551,10 @@
 	allarchives="\(${allarchives// /\\|}\)"
 
 	sed -i \
-		-e "/^libdir=/s:=.*:='${dir}':" \
+		-e "/^libdir=/s:=.*:='${EPREFIX}${dir##/}':" \
 		./${dir}/*.la
 	sed -i \
-		-e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g" \
+		-e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${EPREFIX}${LIBPATH##/}/\1:g" \
 		$(find ./${PREFIX}/lib* -maxdepth 3 -name '*.la') \
 		./${dir}/*.la