Changeset View
Changeset View
Standalone View
Standalone View
Makefile.inc1
| Show First 20 Lines • Show All 959 Lines • ▼ Show 20 Lines | WMAKE= ${TIME_ENV} ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ | ||||
| BWPHASE=${.TARGET:C,^_,,} \ | BWPHASE=${.TARGET:C,^_,,} \ | ||||
| DESTDIR=${WORLDTMP} | DESTDIR=${WORLDTMP} | ||||
| IMAKEENV= ${CROSSENV} | IMAKEENV= ${CROSSENV} | ||||
| IMAKE= ${TIME_ENV} ${IMAKEENV} ${MAKE} -f Makefile.inc1 \ | IMAKE= ${TIME_ENV} ${IMAKEENV} ${MAKE} -f Makefile.inc1 \ | ||||
| ${IMAKE_INSTALL} ${IMAKE_MTREE} | ${IMAKE_INSTALL} ${IMAKE_MTREE} | ||||
| .if empty(.MAKEFLAGS:M-n) | .if empty(.MAKEFLAGS:M-n) | ||||
| IMAKEENV+= PATH=${STRICTTMPPATH:Q}:${INSTALLTMP:Q} \ | IMAKEENV+= PATH=${STRICTTMPPATH:Q}:${INSTALLTMP:Q} \ | ||||
| LD_LIBRARY_PATH=${INSTALLTMP:Q} \ | LD_LIBRARY_PATH=${INSTALLTMP:Q} | ||||
| PATH_LOCALE=${INSTALLTMP}/locale | .if ${.MAKE.OS} == "FreeBSD" | ||||
| IMAKEENV+= PATH_LOCALE=${INSTALLTMP}/locale | |||||
| .endif | |||||
| IMAKE+= __MAKE_SHELL=${INSTALLTMP}/sh | IMAKE+= __MAKE_SHELL=${INSTALLTMP}/sh | ||||
| .else | .else | ||||
| IMAKEENV+= PATH=${TMPPATH:Q}:${INSTALLTMP:Q} | IMAKEENV+= PATH=${TMPPATH:Q}:${INSTALLTMP:Q} | ||||
| .endif | .endif | ||||
| # When generating install media, do not allow user and group information from | # When generating install media, do not allow user and group information from | ||||
| # the build host to affect the contents of the distribution. | # the build host to affect the contents of the distribution. | ||||
| .if make(distributeworld) || make(distrib-dirs) || make(distribution) || \ | .if make(distributeworld) || make(distrib-dirs) || make(distribution) || \ | ||||
| ▲ Show 20 Lines • Show All 492 Lines • ▼ Show 20 Lines | libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | grep -Ev '\[.*]' | \ | ||||
| echo $$2; \ | echo $$2; \ | ||||
| else \ | else \ | ||||
| echo "Required library $$1 not found." >&2; \ | echo "Required library $$1 not found." >&2; \ | ||||
| exit 1; \ | exit 1; \ | ||||
| fi; \ | fi; \ | ||||
| done); \ | done); \ | ||||
| fi; \ | fi; \ | ||||
| ${INSTALLTMP_COPY_HOST_TOOL} $$libs $$progs ${INSTALLTMP} | ${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 | cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale | ||||
| .endif | |||||
kevans: There's a `PATH_LOCALE` setting in one of the *ENV that should get similar treatment- I would… | |||||
Done Inline Actionsi 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. ivy: i went through a couple of approaches here; i think ideally we should disable this entire… | |||||
Done Inline ActionsYeah, fair enough! kevans: Yeah, fair enough! | |||||
| .if defined(NO_ROOT) | .if defined(NO_ROOT) | ||||
| -mkdir -p ${METALOG:H} | -mkdir -p ${METALOG:H} | ||||
| echo "#${MTREE_MAGIC}" > ${METALOG} | echo "#${MTREE_MAGIC}" > ${METALOG} | ||||
| .endif | .endif | ||||
| .if make(distributeworld) | .if make(distributeworld) | ||||
| .for dist in ${EXTRA_DISTRIBUTIONS} | .for dist in ${EXTRA_DISTRIBUTIONS} | ||||
| -mkdir ${DESTDIR}/${DISTDIR}/${dist} | -mkdir ${DESTDIR}/${DISTDIR}/${dist} | ||||
| ${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.root.dist \ | ${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.root.dist \ | ||||
| ▲ Show 20 Lines • Show All 2,610 Lines • Show Last 20 Lines | |||||
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...