Makefile.inc1: Only copy locales to INSTALLTMP on FreeBSD
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.
MFC after: 2 weeks
Reviewed by: kevans, emaste
Sponsored by: https://www.patreon.com/bsdivy
Differential Revision: https://reviews.freebsd.org/D56677
This commit is contained in:
+9
-2
@@ -965,8 +965,10 @@ IMAKE= ${TIME_ENV} ${IMAKEENV} ${MAKE} -f Makefile.inc1 \
|
||||
${IMAKE_INSTALL} ${IMAKE_MTREE}
|
||||
.if empty(.MAKEFLAGS:M-n)
|
||||
IMAKEENV+= PATH=${STRICTTMPPATH:Q}:${INSTALLTMP:Q} \
|
||||
LD_LIBRARY_PATH=${INSTALLTMP:Q} \
|
||||
PATH_LOCALE=${INSTALLTMP}/locale
|
||||
LD_LIBRARY_PATH=${INSTALLTMP:Q}
|
||||
.if ${.MAKE.OS} == "FreeBSD"
|
||||
IMAKEENV+= PATH_LOCALE=${INSTALLTMP}/locale
|
||||
.endif
|
||||
IMAKE+= __MAKE_SHELL=${INSTALLTMP}/sh
|
||||
.else
|
||||
IMAKEENV+= PATH=${TMPPATH:Q}:${INSTALLTMP:Q}
|
||||
@@ -1475,7 +1477,12 @@ distributeworld installworld stageworld: _installcheck_world .PHONY
|
||||
done); \
|
||||
fi; \
|
||||
${INSTALLTMP_COPY_HOST_TOOL} $$libs $$progs ${INSTALLTMP}
|
||||
# On non-FreeBSD systems, there's no point copying locales here
|
||||
# since we aren't going to overwrite them anyway. This avoids
|
||||
# failing if /usr/share/locale has odd modes (e.g., openSUSE).
|
||||
.if ${.MAKE.OS} == "FreeBSD"
|
||||
cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale
|
||||
.endif
|
||||
.if defined(NO_ROOT)
|
||||
-mkdir -p ${METALOG:H}
|
||||
echo "#${MTREE_MAGIC}" > ${METALOG}
|
||||
|
||||
Reference in New Issue
Block a user