Makefile.inc1: Only copy locales to INSTALLTMP on FreeBSD
ClosedPublic
Actions

Authored by ivy on Tue, Apr 28, 3:29 AM.

Details

Reviewers

emaste
jrtc27
kevans

Commits

rG4429630d1ca9: Makefile.inc1: Only copy locales to INSTALLTMP on FreeBSD

Summary

Makefile.inc1 copies locales to ${INSTALLTMP} to avoid issues when
running make installworld on a live system. However, this can break
on non-FreeBSD systems, e.g. on openSUSE where /usr/share/locales
has mode 0555, which means after we copy it, we can't delete it,
so the build fails.

Since this functionality is only useful when installing over a
live system, disable it when the build host is not FreeBSD.

Sponsored by: https://www.patreon.com/bsdivy

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

ivy created this revision.Tue, Apr 28, 3:29 AM

Herald added a subscriber: imp. · View Herald TranscriptTue, Apr 28, 3:29 AM

ivy requested review of this revision.Tue, Apr 28, 3:29 AM

Harbormaster completed remote builds in B72593: Diff 176690.Tue, Apr 28, 3:29 AM

kevans added inline comments.Tue, Apr 28, 4:06 AM

Makefile.inc1
1484–1485	There's a `PATH_LOCALE` setting in one of the *ENV that should get similar treatment- I would suspect the variable is pretty specific to our libc (and Dragonfly, maybe Illumos and macOS), but probably better to be clear. I'd also be supportive of your other proposal to avoid it if DESTDIR != /, though I don't know if you dismissed that idea entirely. I don't feel strongly about it...

only set PATH_LOCALE on FreeBSD

Harbormaster completed remote builds in B72601: Diff 176713.Tue, Apr 28, 12:55 PM

ivy added inline comments.Tue, Apr 28, 12:56 PM

Makefile.inc1
1484–1485	i went through a couple of approaches here; i think ideally we should disable this entire feature, even on FreeBSD, when we aren't doing a live installworld, but that's a larger and more risky change... this is the least invasive change that fixes the Linux build in the mean time.