Skip to content

Deduplicate the ld.so.conf.d include #1599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
anthonyryan1 wants to merge 1 commit into from
+1 −5
Closed

Deduplicate the ld.so.conf.d include #1599

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions lib/portage/util/env_update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,11 +195,7 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env, writemsg_lev

ldsoconf_path = os.path.join(eroot, "etc", "ld.so.conf")

newld = list(specials["LDPATH"])
if os.path.isdir(os.path.join(eroot, "etc", "ld.so.conf.d")):
# Preserve include directive so ldconfig picks up ld.so.conf.d/*.conf
newld.append(f"include {eprefix}/etc/ld.so.conf.d/*.conf")

newld = specials["LDPATH"]
if grabfile(ldsoconf_path) != newld:
# ld.so.conf needs updating and ldconfig needs to be run
with atomic_ofstream(ldsoconf_path) as myfd:
Expand Down
Loading