33176cdc87
make copies instead. There's too many times that we can't run the new binaries with old libraries. Making the links when things are known to be 'safe' is a nice optimization, but a copy of all the binaries is only 30MB, so saving the copies at the cost of increased support when new symbols are added and used as part of the bootstrap seems to be unwise. There may be additional optimizations possible here, especially for !FreeBSD hosts. However, that's beyond the scope of the problem I'm trying to fix with make failing mid-way through an installworld across change r363679. This optimization there caused us to run a new binary with an old library once a new make was installed due to the symbolic link. One could just copy make, but then other binaries fail as well, so rather than play whack-a-mole, I opted to take us back to the old way. Before r340157 or so we did copies (thogh of a lot fewer artifacts), and we didn't have issues like this. Reviewed by: arichards@ Differential Revision: https://reviews.freebsd.org/D25967
180 lines
5.9 KiB
Makefile
180 lines
5.9 KiB
Makefile
# $FreeBSD$
|
|
|
|
.PATH: ${.CURDIR}/../../include
|
|
|
|
LIB= egacy
|
|
SRC=
|
|
INCSGROUPS= INCS SYSINCS CASPERINC UFSINCS FFSINCS MSDOSFSINCS DISKINCS
|
|
INCS=
|
|
|
|
SYSINCSDIR= ${INCLUDEDIR}/sys
|
|
CASPERINCDIR= ${INCLUDEDIR}/casper
|
|
# Also add ufs/ffs/msdosfs/disk headers to allow building makefs as a bootstrap tool
|
|
UFSINCSDIR= ${INCLUDEDIR}/ufs/ufs
|
|
FFSINCSDIR= ${INCLUDEDIR}/ufs/ffs
|
|
MSDOSFSINCSDIR= ${INCLUDEDIR}/fs/msdosfs
|
|
DISKINCSDIR= ${INCLUDEDIR}/sys/disk
|
|
|
|
BOOTSTRAPPING?= 0
|
|
|
|
_WITH_PWCACHEDB!= grep -c pwcache_groupdb /usr/include/grp.h || true
|
|
.if ${_WITH_PWCACHEDB} == 0
|
|
.PATH: ${.CURDIR}/../../contrib/libc-pwcache
|
|
CFLAGS+= -I${.CURDIR}/../../contrib/libc-pwcache \
|
|
-I${.CURDIR}/../../lib/libc/include
|
|
SRCS+= pwcache.c
|
|
.endif
|
|
|
|
_WITH_STRSVIS!= grep -c strsvis /usr/include/vis.h || true
|
|
.if ${_WITH_STRSVIS} == 0
|
|
.PATH: ${.CURDIR}/../../contrib/libc-vis
|
|
SRCS+= vis.c
|
|
CFLAGS+= -I${.CURDIR}/../../contrib/libc-vis \
|
|
-I${.CURDIR}/../../lib/libc/include
|
|
.endif
|
|
|
|
_WITH_REALLOCARRAY!= grep -c reallocarray /usr/include/stdlib.h || true
|
|
.if ${_WITH_REALLOCARRAY} == 0
|
|
.PATH: ${.CURDIR}/../../lib/libc/stdlib
|
|
INCS+= stdlib.h
|
|
SRCS+= reallocarray.c
|
|
CFLAGS+= -I${.CURDIR}/../../lib/libc/include
|
|
.endif
|
|
|
|
_WITH_UTIMENS!= grep -c utimensat /usr/include/sys/stat.h || true
|
|
.if ${_WITH_UTIMENS} == 0
|
|
SYSINCS+= stat.h
|
|
SRCS+= futimens.c utimensat.c
|
|
.endif
|
|
|
|
_WITH_EXPLICIT_BZERO!= grep -c explicit_bzero /usr/include/strings.h || true
|
|
.if ${_WITH_EXPLICIT_BZERO} == 0
|
|
.PATH: ${SRCTOP}/sys/libkern
|
|
INCS+= strings.h
|
|
SRCS+= explicit_bzero.c
|
|
.endif
|
|
|
|
.if exists(/usr/include/capsicum_helpers.h)
|
|
_WITH_CAPH_ENTER!= grep -c caph_enter /usr/include/capsicum_helpers.h || true
|
|
_WITH_CAPH_RIGHTS_LIMIT!= grep -c caph_rights_limit /usr/include/capsicum_helpers.h || true
|
|
.endif
|
|
.if !defined(_WITH_CAPH_ENTER) || ${_WITH_CAPH_ENTER} == 0 || ${_WITH_CAPH_RIGHTS_LIMIT} == 0
|
|
.PATH: ${SRCTOP}/lib/libcapsicum
|
|
INCS+= capsicum_helpers.h
|
|
.PATH: ${SRCTOP}/lib/libcasper/libcasper
|
|
INCS+= libcasper.h
|
|
.endif
|
|
|
|
CASPERINC+= ${SRCTOP}/lib/libcasper/services/cap_fileargs/cap_fileargs.h
|
|
|
|
.if empty(SRCS)
|
|
SRCS= dummy.c
|
|
.endif
|
|
|
|
.if defined(CROSS_BUILD_TESTING)
|
|
SUBDIR= cross-build
|
|
.endif
|
|
|
|
# To allow bootstrapping makefs on FreeBSD 11 or non-FreeBSD systems:
|
|
UFSINCS+= ${SRCTOP}/sys/ufs/ufs/dinode.h
|
|
UFSINCS+= ${SRCTOP}/sys/ufs/ufs/dir.h
|
|
FFSINCS+= ${SRCTOP}/sys/ufs/ffs/fs.h
|
|
|
|
MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/bootsect.h
|
|
MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/bpb.h
|
|
MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/denode.h
|
|
MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/direntry.h
|
|
MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/fat.h
|
|
MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/msdosfsmount.h
|
|
DISKINCS+= ${SRCTOP}/sys/sys/disk/bsd.h
|
|
|
|
# Needed to build config (since it uses libnv)
|
|
SYSINCS+= ${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h \
|
|
${SRCTOP}/sys/sys/dnv.h
|
|
|
|
# vtfontcvt is using sys/font.h
|
|
SYSINCS+= ${SRCTOP}/sys/sys/font.h
|
|
|
|
# We want to run the build with only ${WORLDTMP} in $PATH to ensure we don't
|
|
# accidentally run tools that are incompatible but happen to be in $PATH.
|
|
# This is especially important when building on Linux/MacOS where many of the
|
|
# programs used during the build accept different flags or generate different
|
|
# output. On those platforms we only symlink the tools known to be compatible
|
|
# (e.g. basic utilities such as mkdir) into ${WORLDTMP} and build all others
|
|
# from the FreeBSD sources during the bootstrap-tools stage.
|
|
|
|
# basic commands: It is fine to use the host version for all of these even on
|
|
# Linux/MacOS since we only use flags that are supported by all of them.
|
|
_host_tools_to_symlink= basename bzip2 bunzip2 chmod chown cmp comm cp date dd \
|
|
dirname echo env false find fmt gzip gunzip head hostname id ln ls \
|
|
mkdir mv nice patch rm realpath sh sleep stat tee touch tr true uname \
|
|
uniq wc which
|
|
|
|
# We also need a symlink to the absolute path to the make binary used for
|
|
# the toplevel makefile. This is not necessarily the same as `which make`
|
|
# since e.g. on Linux and MacOS that will be GNU make.
|
|
_make_abs!= which "${MAKE}"
|
|
_host_abs_tools_to_symlink= ${_make_abs}:make ${_make_abs}:bmake
|
|
|
|
host-symlinks:
|
|
@echo "Linking host tools into ${DESTDIR}/bin"
|
|
.for _tool in ${_host_tools_to_symlink}
|
|
@source_path=`which ${_tool}`; \
|
|
if [ ! -e "$${source_path}" ] ; then \
|
|
echo "Cannot find host tool '${_tool}'"; false; \
|
|
fi; \
|
|
rm -f "${DESTDIR}/bin/${_tool}"; \
|
|
cp -f "$${source_path}" "${DESTDIR}/bin/${_tool}"
|
|
.endfor
|
|
.for _tool in ${_host_abs_tools_to_symlink}
|
|
@source_path="${_tool:S/:/ /:[1]}"; \
|
|
target_path="${DESTDIR}/bin/${_tool:S/:/ /:[2]}"; \
|
|
if [ ! -e "$${source_path}" ] ; then \
|
|
echo "Host tool '${src_path}' is missing"; false; \
|
|
fi; \
|
|
rm -f "$${target_path}"; \
|
|
cp -f "$${source_path}" "$${target_path}"
|
|
.endfor
|
|
.if exists(/usr/libexec/flua)
|
|
rm -f ${DESTDIR}/usr/libexec/flua
|
|
cp -f /usr/libexec/flua ${DESTDIR}/usr/libexec/flua
|
|
.endif
|
|
|
|
# Create all the directories that are needed during the legacy, bootstrap-tools
|
|
# and cross-tools stages. We do this here using mkdir since mtree may not exist
|
|
# yet (this happens if we are crossbuilding from Linux/Mac).
|
|
INSTALLDIR_LIST= \
|
|
bin \
|
|
lib/casper \
|
|
lib/geom \
|
|
usr/include/casper \
|
|
usr/include/private/ucl \
|
|
usr/include/private/zstd \
|
|
usr/lib \
|
|
usr/libexec
|
|
|
|
installdirs:
|
|
mkdir -p ${INSTALLDIR_LIST:S,^,${DESTDIR}/,}
|
|
|
|
# Link usr/bin, sbin, and usr/sbin to bin so that it doesn't matter whether a
|
|
# bootstrap tool was added to WORLTMP with a symlink or by building it in the
|
|
# bootstrap-tools phase. We could also overrride BINDIR when building bootstrap
|
|
# tools but adding the symlinks is easier and means all tools are also
|
|
# in the directory that they are installed to normally.
|
|
|
|
.for _dir in sbin usr/sbin usr/bin
|
|
# delete existing directories from before r340157
|
|
@if [ ! -L ${DESTDIR}/${_dir} ]; then \
|
|
echo "removing old non-symlink ${DESTDIR}/${_dir}"; \
|
|
rm -rf "${DESTDIR}/${_dir}"; \
|
|
fi
|
|
.endfor
|
|
ln -sfn bin ${DESTDIR}/sbin
|
|
ln -sfn ../bin ${DESTDIR}/usr/bin
|
|
ln -sfn ../bin ${DESTDIR}/usr/sbin
|
|
.for _group in ${INCSGROUPS:NINCS}
|
|
mkdir -p "${DESTDIR}/${${_group}DIR}"
|
|
.endfor
|
|
|
|
.include <bsd.lib.mk>
|