Remove -m (update) from ldconfig -32 invocation on startup.
ClosedPublic
Actions

Authored by kib on Sep 26 2018, 9:37 PM.

Details

Reviewers

brooks
emaste
flz
imp

Commits

rS338964: Remove -m (update) from ldconfig -32 & -soft invocation on startup.

Summary

Since r154114 which introduced ldconfig_local32_dirs, ldconfig -32 was called with -m. This means that ld32.so.hints paths set is not cleared for compat32 on boot, unlike ld,so,hints.

The patch fixes the asymmetry, I am not sure if this just a typo or there was some rationale behind the difference.

Noted by: Andreas Longwitz <longwitz@incore.de>

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

kib created this revision.Sep 26 2018, 9:37 PM

Herald added a subscriber: imp. · View Herald TranscriptSep 26 2018, 9:37 PM

Harbormaster completed remote builds in B19829: Diff 48491.Sep 26 2018, 9:37 PM

This seems to make sense.

@jhb when expanding the diff I noticed that we didn't add a mips64 case when it grew n32 support.

This revision is now accepted and ready to land.Sep 26 2018, 10:07 PM

Seems reasonable to me.

bdrewery added a subscriber: bdrewery.Sep 26 2018, 11:18 PM

bdrewery added inline comments.

sbin/init/rc.d/ldconfig
83 ↗	(On Diff #48491)	What about this `-m`?

kib added a reviewer: imp.Sep 26 2018, 11:45 PM

kib marked an inline comment as done.

kib removed a subscriber: imp.

kib added inline comments.

sbin/init/rc.d/ldconfig
83 ↗	(On Diff #48491)	This -m was added in r294295 by imp. From my code reading -soft implies separate ld-soft.so.hints, but I will wait for the confirmation. In other words yes, the instance should be removed as well.