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

Collapse All | Expand All

(-)portage-2.2.0_alpha142.orig/bin/ebuild-helpers/ecompressdir (-1 / +3 lines)
Lines 67-72 Link Here
67
	find "${dir}" -type f ${negate} -iname '*'${suffix} -print0 | ${XARGS} -0 ${binary}
67
	find "${dir}" -type f ${negate} -iname '*'${suffix} -print0 | ${XARGS} -0 ${binary}
68
	((ret|=$?))
68
	((ret|=$?))
69
69
70
	(find "${dir}" -type l -print0) > "${T}"/ecompress-filelist
70
	while read -r -d $'\0' brokenlink ; do
71
	while read -r -d $'\0' brokenlink ; do
71
		[[ -e ${brokenlink} ]] && continue
72
		[[ -e ${brokenlink} ]] && continue
72
		olddest=$(readlink "${brokenlink}")
73
		olddest=$(readlink "${brokenlink}")
Lines 97-103 Link Here
97
			&& ln -snf "${newdest}" "${brokenlink}${suffix}" \
98
			&& ln -snf "${newdest}" "${brokenlink}${suffix}" \
98
			|| ln -snf "${newdest}" "${brokenlink%${suffix}}"
99
			|| ln -snf "${newdest}" "${brokenlink%${suffix}}"
99
		((ret|=$?))
100
		((ret|=$?))
100
	done < <(find "${dir}" -type l -print0)
101
	done < "${T}"/ecompress-filelist
102
	rm "${T}"/ecompress-filelist
101
	return ${ret}
103
	return ${ret}
102
}
104
}
103
105
(-)portage-2.2.0_alpha142.orig/bin/ebuild-helpers/prepstrip (-7 / +6 lines)
Lines 276-292 Link Here
276
else
276
else
277
	get_inode_number() { stat -c '%i' "$1"; }
277
	get_inode_number() { stat -c '%i' "$1"; }
278
fi
278
fi
279
# Use sort -u to eliminate duplicates for bug #445336.
280
(scanelf -yqRBF '#k%F' -k '.symtab' "$@"
281
 find "$@" -type f ! -type l -name '*.a' ) | LC_ALL=C sort -u > ${tmpdir}/filelist
282
279
cd "${tmpdir}/inodes" || die "cd failed unexpectedly"
283
cd "${tmpdir}/inodes" || die "cd failed unexpectedly"
280
while read -r x ; do
284
while read -r x ; do
281
	inode_link=$(get_inode_number "${x}") || die "stat failed unexpectedly"
285
	inode_link=$(get_inode_number "${x}") || die "stat failed unexpectedly"
282
	echo "${x}" >> "${inode_link}" || die "echo failed unexpectedly"
286
	echo "${x}" >> "${inode_link}" || die "echo failed unexpectedly"
283
done < <(
287
done < ${tmpdir}/filelist
284
	# Use sort -u to eliminate duplicates for bug #445336.
288
rm ${tmpdir}/filelist
285
	(
286
		scanelf -yqRBF '#k%F' -k '.symtab' "$@"
287
		find "$@" -type f ! -type l -name '*.a'
288
	) | LC_ALL=C sort -u
289
)
290
289
291
# Now we look for unstripped binaries.
290
# Now we look for unstripped binaries.
292
for inode_link in $(shopt -s nullglob; echo *) ; do
291
for inode_link in $(shopt -s nullglob; echo *) ; do

Return to bug 447810