From owner-svn-src-head@freebsd.org Thu Apr 4 04:14:21 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 80DFD156108E; Thu, 4 Apr 2019 04:14:21 +0000 (UTC) (envelope-from oshogbo@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 1F63483D6C; Thu, 4 Apr 2019 04:14:21 +0000 (UTC) (envelope-from oshogbo@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 EFD04201CF; Thu, 4 Apr 2019 04:14:20 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x344EK9W015741; Thu, 4 Apr 2019 04:14:20 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x344EKVA015740; Thu, 4 Apr 2019 04:14:20 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201904040414.x344EKVA015740@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski Date: Thu, 4 Apr 2019 04:14:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r345870 - head/tools/build X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: head/tools/build X-SVN-Commit-Revision: 345870 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1F63483D6C X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Apr 2019 04:14:21 -0000 Author: oshogbo Date: Thu Apr 4 04:14:20 2019 New Revision: 345870 URL: https://svnweb.freebsd.org/changeset/base/345870 Log: Add cap_fileargs.h to -legacy if needed. Reviewed by: arichardson Differential Revision: https://reviews.freebsd.org/D19685 Modified: head/tools/build/Makefile Modified: head/tools/build/Makefile ============================================================================== --- head/tools/build/Makefile Thu Apr 4 02:08:36 2019 (r345869) +++ head/tools/build/Makefile Thu Apr 4 04:14:20 2019 (r345870) @@ -4,10 +4,11 @@ LIB= egacy SRC= -INCSGROUPS= INCS SYSINCS +INCSGROUPS= INCS SYSINCS CASPERINC INCS= SYSINCSDIR= ${INCLUDEDIR}/sys +CASPERINCDIR= ${INCLUDEDIR}/casper BOOTSTRAPPING?= 0 @@ -58,6 +59,10 @@ INCS+= capsicum_helpers.h INCS+= libcasper.h .endif +.if !exists(/usr/include/casper/cap_fileargs.h) +CASPERINC+= ${SRCTOP}/lib/libcasper/services/cap_fileargs/cap_fileargs.h +.endif + .if empty(SRCS) SRCS= dummy.c .endif @@ -116,7 +121,7 @@ host-symlinks: # 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). installdirs: -.for _dir in bin usr/lib usr/include lib/geom lib/casper +.for _dir in bin usr/lib usr/include usr/include/casper lib/geom lib/casper mkdir -p "${DESTDIR}/${_dir}" .endfor # Link usr/bin, sbin, and usr/sbin to bin so that it doesn't matter whether a