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

Collapse All | Expand All

(-)a/pym/portage/util/env_update.py (-2 / +4 lines)
Lines 306-318 def _env_update(makelinks, target_root, prev_mtimes, contents, env, Link Here
306
		if not libdir_contents_changed:
306
		if not libdir_contents_changed:
307
			makelinks = False
307
			makelinks = False
308
308
309
	ldconfig = "/sbin/ldconfig"
309
	ldconfig = os.path.join(eroot, "sbin", "ldconfig")
310
	if "CHOST" in settings and "CBUILD" in settings and \
310
	if "CHOST" in settings and "CBUILD" in settings and \
311
		settings["CHOST"] != settings["CBUILD"]:
311
		settings["CHOST"] != settings["CBUILD"]:
312
		ldconfig = find_binary("%s-ldconfig" % settings["CHOST"])
312
		ldconfig = find_binary("%s-ldconfig" % settings["CHOST"])
313
	elif not (os.access(ldconfig, os.X_OK) and os.path.isfile(ldconfig)):
314
		ldconfig = None
313
315
314
	# Only run ldconfig as needed
316
	# Only run ldconfig as needed
315
	if makelinks and ldconfig and not eprefix:
317
	if makelinks and ldconfig:
316
		# ldconfig has very different behaviour between FreeBSD and Linux
318
		# ldconfig has very different behaviour between FreeBSD and Linux
317
		if ostype == "Linux" or ostype.lower().endswith("gnu"):
319
		if ostype == "Linux" or ostype.lower().endswith("gnu"):
318
			# We can't update links if we haven't cleaned other versions first, as
320
			# We can't update links if we haven't cleaned other versions first, as

Return to bug 532100