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

Collapse All | Expand All

(-)multilib.eclass.orig (-13 / +7 lines)
Lines 405-411 Link Here
405
					else
405
					else
406
						echo "#ifdef ${sym}"
406
						echo "#ifdef ${sym}"
407
					fi
407
					fi
408
					echo "#include \"$(create_ml_includes-relative_between ${dest}/$(dirname ${file}) ${dir}/${file})\""
408
					echo "#include <$(create_ml_includes-absolute ${dir}/${file})>"
409
					echo "#endif /* ${sym} */"
409
					echo "#endif /* ${sym} */"
410
					echo ""
410
					echo ""
411
				fi
411
				fi
Lines 417-441 Link Here
417
}
417
}
418
418
419
# Helper function for create_ml_includes
419
# Helper function for create_ml_includes
420
create_ml_includes-relative_between() {
420
create_ml_includes-absolute() {
421
	local src="$(create_ml_includes-tidy_path ${1})"
421
	local dst="$(create_ml_includes-tidy_path ${1})"
422
	local dst="$(create_ml_includes-tidy_path ${2})"
423
422
424
	src=(${src//\// })
425
	dst=(${dst//\// })
423
	dst=(${dst//\// })
426
424
427
	local i
425
	local i
428
	for ((i=0; i<${#src[*]}; i++)); do
426
	for ((i=0; i<${#dst[*]}; i++)); do
429
		[ "${dst[i]}" != "${src[i]}" ] && break
427
		[ "${dst[i]}" == "include" ] && break
430
	done
428
	done
431
429
432
	local common=$i
430
	local strip_upto=$i
433
431
434
	for ((i=${#src[*]}; i>common; i--)); do
432
	for ((i=strip_upto+1; i<${#dst[*]}-1; i++)); do
435
		echo -n ../
436
	done
437
438
	for ((i=common; i<${#dst[*]}-1; i++)); do
439
		echo -n ${dst[i]}/
433
		echo -n ${dst[i]}/
440
	done
434
	done
441
435

Return to bug 88276