d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Building head on stable/11 requires libzstd

Browse Source 
Add lib/libzstd to _elftoolchain_libs

tools/build/Makefile needs to create the install dir for libzstd
Since this would make the line too long, rework to use a list
in one per line format (easier to add in future)
and dispense with the .for loop

Reviewed by:	emaste bapt
Differential Revision:	https://reviews.freebsd.org/D220134
This commit is contained in:
Simon J. Gerraty 2019-10-28 20:45:29 +00:00
parent 484456b2d8
commit 17adf17b30
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=354138
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.inc1
View File

@ -1697,7 +1697,7 @@ buildkernel: .MAKE .PHONY
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> Kernel build for ${_kernel} completed on `LC_ALL=C date`" @echo ">>> Kernel build for ${_kernel} completed on `LC_ALL=C date`"
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
.endfor .endfor
@seconds=$$(($$(date '+%s') - ${_BUILDKERNEL_START})); \ @seconds=$$(($$(date '+%s') - ${_BUILDKERNEL_START})); \
echo -n ">>> Kernel(s) ${BUILDKERNELS} built in $$seconds seconds, "; \ echo -n ">>> Kernel(s) ${BUILDKERNELS} built in $$seconds seconds, "; \
@ -2159,7 +2159,7 @@ _bootstrap_tools_links+=m4 lex
# r339083 libelf: correct mips64el test to use ELF header # r339083 libelf: correct mips64el test to use ELF header
# r348347 Add missing powerpc64 relocation support to libdwarf # r348347 Add missing powerpc64 relocation support to libdwarf
.if ${BOOTSTRAPPING} < 1300030 .if ${BOOTSTRAPPING} < 1300030
_elftoolchain_libs= lib/libelf lib/libdwarf _elftoolchain_libs= lib/libelf lib/libdwarf lib/libzstd
${_bt}-lib/libelf: ${_bt_m4_depend} ${_bt}-lib/libelf: ${_bt_m4_depend}
${_bt}-lib/libdwarf: ${_bt_m4_depend} ${_bt}-lib/libdwarf: ${_bt_m4_depend}
.endif .endif
@ -2361,7 +2361,6 @@ ${_bt}-link-${_tool}: .PHONY .MAKE
${_bt}-links: ${_bt}-link-${_tool} ${_bt}-links: ${_bt}-link-${_tool}
.endfor .endfor
bootstrap-tools: ${_bt}-links .PHONY bootstrap-tools: ${_bt}-links .PHONY
# Please document (add comment) why something is in 'bootstrap-tools'. # Please document (add comment) why something is in 'bootstrap-tools'.

13
tools/build/Makefile
View File

@ -120,10 +120,17 @@ host-symlinks:
# Create all the directories that are needed during the legacy, bootstrap-tools # 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 # 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). # yet (this happens if we are crossbuilding from Linux/Mac).
INSTALLDIR_LIST= \
bin \
lib/casper \
lib/geom \
usr/include/casper \
usr/include/private/zstd \
usr/lib \
installdirs: installdirs:
.for _dir in bin usr/lib usr/include usr/include/casper lib/geom lib/casper mkdir -p ${INSTALLDIR_LIST:S,^,${DESTDIR}/,}
mkdir -p "${DESTDIR}/${_dir}"
.endfor
# Link usr/bin, sbin, and usr/sbin to bin so that it doesn't matter whether a # 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 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 # bootstrap-tools phase. We could also overrride BINDIR when building bootstrap