Attachment #203264 for bug #283761




# -are-, and not where they -used- to be.  also, any dependencies we have
# on our own .la files need to be updated.
fix_libtool_libdir_paths() {
	pushd "${D}" >/dev/null

	local path
	local dir=${LIBPATH}
	local allarchives=$(cd ./${dir}; echo *.la)
	allarchives="\(${allarchives// /\\|}\)"

	for path in ${dir}{/32,/64,} ; do
		if [[ -d ${path} ]]; then
			sed -i \
				-e "/^libdir=/s:=.*:='${path}':" \
				./${path}/*.la
		fi
	done

	sed -i \
		-e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g" \
		$(find ./${PREFIX}/lib* -maxdepth 3 -name '*.la') \
		./${dir}/*.la


Return to bug 283761

Lines 2481-2497 Link Here

(-)toolchain.eclass.orig (-3 / +9 lines)
2481	# -are-, and not where they -used- to be. also, any dependencies we have	2481	# -are-, and not where they -used- to be. also, any dependencies we have
2482	# on our own .la files need to be updated.	2482	# on our own .la files need to be updated.
2483	fix_libtool_libdir_paths() {	2483	fix_libtool_libdir_paths() {
2484	pushd "${D}" >/dev/null	2484	pushd "${D}" >/dev/null
2485		2485
		2486	local path
2486	local dir=${LIBPATH}	2487	local dir=${LIBPATH}
2487	local allarchives=$(cd ./${dir}; echo *.la)	2488	local allarchives=$(cd ./${dir}; echo *.la)
2488	allarchives="\(${allarchives// /\\\|}\)"	2489	allarchives="\(${allarchives// /\\\|}\)"
2489		2490
2490	sed -i \	2491	for path in ${dir}{/32,/64,} ; do
2491	-e "/^libdir=/s:=.*:='${dir}':" \	2492	if [[ -d ${path} ]]; then
2492	./${dir}/*.la	2493	sed -i \
		2494	-e "/^libdir=/s:=.*:='${path}':" \
		2495	./${path}/*.la
		2496	fi
		2497	done
		2498
2493	sed -i \	2499	sed -i \
2494	-e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g" \	2500	-e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g" \
2495	$(find ./${PREFIX}/lib* -maxdepth 3 -name '*.la') \	2501	$(find ./${PREFIX}/lib* -maxdepth 3 -name '*.la') \
2496	./${dir}/*.la	2502	./${dir}/*.la
2497		2503