From owner-svn-src-all@freebsd.org Mon Oct 28 20:45:30 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6225615C958; Mon, 28 Oct 2019 20:45:30 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4726DV21mQz4TQg; Mon, 28 Oct 2019 20:45:30 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 28B91F24F; Mon, 28 Oct 2019 20:45:30 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9SKjUpA077837; Mon, 28 Oct 2019 20:45:30 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9SKjTpO077834; Mon, 28 Oct 2019 20:45:29 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201910282045.x9SKjTpO077834@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Mon, 28 Oct 2019 20:45:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r354138 - in head: . tools/build X-SVN-Group: head X-SVN-Commit-Author: sjg X-SVN-Commit-Paths: in head: . tools/build X-SVN-Commit-Revision: 354138 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Oct 2019 20:45:30 -0000 Author: sjg Date: Mon Oct 28 20:45:29 2019 New Revision: 354138 URL: https://svnweb.freebsd.org/changeset/base/354138 Log: Building head on stable/11 requires libzstd 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 Modified: head/Makefile.inc1 head/tools/build/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Mon Oct 28 19:00:27 2019 (r354137) +++ head/Makefile.inc1 Mon Oct 28 20:45:29 2019 (r354138) @@ -1697,7 +1697,7 @@ buildkernel: .MAKE .PHONY @echo "--------------------------------------------------------------" @echo ">>> Kernel build for ${_kernel} completed on `LC_ALL=C date`" @echo "--------------------------------------------------------------" - + .endfor @seconds=$$(($$(date '+%s') - ${_BUILDKERNEL_START})); \ 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 # r348347 Add missing powerpc64 relocation support to libdwarf .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/libdwarf: ${_bt_m4_depend} .endif @@ -2360,7 +2360,6 @@ ${_bt}-link-${_tool}: .PHONY .MAKE fi ${_bt}-links: ${_bt}-link-${_tool} .endfor - bootstrap-tools: ${_bt}-links .PHONY Modified: head/tools/build/Makefile ============================================================================== --- head/tools/build/Makefile Mon Oct 28 19:00:27 2019 (r354137) +++ head/tools/build/Makefile Mon Oct 28 20:45:29 2019 (r354138) @@ -120,10 +120,17 @@ host-symlinks: # 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/zstd \ + usr/lib \ + installdirs: -.for _dir in bin usr/lib usr/include usr/include/casper lib/geom lib/casper - mkdir -p "${DESTDIR}/${_dir}" -.endfor + 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