From nobody Tue Apr 16 20:12:31 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJwFD4Y3Hz5H0V2; Tue, 16 Apr 2024 20:12:32 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VJwFD0y1Yz4sbv; Tue, 16 Apr 2024 20:12:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uybj64E6t46IXRYoIhbY0AaDDKn2okF7j0jUFZwArfY=; b=hpfgLcVl1vhltWssr7spuZRgnlq4y0rso54IiG9E20T97SeCWZxmnuKvLIjZbBYNenZsL2 zlC2aOko9gizXcfnlS1RbvKO6KgRaLESyHsLAoJa/DZ20iOQhRRflkUObWdp+8mTE4VBtv pSgth3WnIkCKPemxTySZnfMheK0XAOOu/gk05YOCQS8PQjPV+HvZ2pHhFH4Gx+TqA8D95y F65AcvdHl08Q6xv6WBrFl+cs5apYOIHUx6LxczO6y1rUVUcsx8akNZ3BkBbFPSLafDHMrf EXecWEGa2f/v3aFLX1NnLajTTowhZyQkRQxDSZBoWx5yeSwG6EvelVnvmeSRcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713298352; a=rsa-sha256; cv=none; b=OIi9ljnFCGAoe9iVNmnK7+jXTj1XwXGGBPIzb/6XHjJvMBPToxfQTnQhTeAwNh5WemKnMh Y4rQr3Fwp7rW9Pvko27GyowwnKIYULbcGtwQ/DeljgbuODfskGRi+0jXGxuuDHz2ZU1Bay 6LSxk06EqN00kai1bY8X9u2S6aoZlurf0Z0558Vt98vfWM0dzDlkF8KVI9E19zMjfuUPE8 UfRObLxIgNDIhlgEhyWwVOvsTOaWOblX8MWx9yWpDWxY4gVQ5KIsMywsC79K56+J3gAvvE JaT1SSqieevp1fhF5qzh3Ps7Wgg/vNXiGzTaXs9wn2mTfnabqZ0RAOou3z2Mhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uybj64E6t46IXRYoIhbY0AaDDKn2okF7j0jUFZwArfY=; b=r9wtMdPw7xs0D3I9nC/3/25RHdUCTm4JxEkJAmy2xJ3tM+VXgOvhKyvmuhqgLw/8caslPj 2jbaFvRaXBheNveNBKnO3C3+2w1q8mM+9kkqOfyvPnE5uSgDljSQxdQmuQzJZC6ZQWMZ8v 4T9X/HNxwMf0foa0gn2f1tfWVOkH66VZTOZdSE367Q9zKScgw8baMilHzgiBJDmbb6bc9u HQ6ID4jZCQ20r3+jOChoyWEt+Q7BiW48j8NBG3txKUKZo6v+Ve6XbLH0+iPDIkLG0f3/RN MDNbdEVgchA48l7CezRpCgmtO5AqNQuDBKcRczu3nZnLm02BwaT9HfSeEaP9iw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJwFD0ZMFzxPL; Tue, 16 Apr 2024 20:12:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43GKCVTs037196; Tue, 16 Apr 2024 20:12:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GKCVHx037193; Tue, 16 Apr 2024 20:12:31 GMT (envelope-from git) Date: Tue, 16 Apr 2024 20:12:31 GMT Message-Id: <202404162012.43GKCVHx037193@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 6d41d985fdbf - stable/14 - libsa: Move include file creation to the end of the Makefile List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6d41d985fdbf713adb204840aabfea551d4f8b47 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6d41d985fdbf713adb204840aabfea551d4f8b47 commit 6d41d985fdbf713adb204840aabfea551d4f8b47 Author: Warner Losh AuthorDate: 2024-01-31 23:42:49 +0000 Commit: Warner Losh CommitDate: 2024-04-16 19:54:22 +0000 libsa: Move include file creation to the end of the Makefile The include file symblic links, etc are out of place where they are. Move them to the end of the file. No functional change intended. Sponsored by: Netflix (cherry picked from commit 7c8b126c1a7b30fe690800d7e27b308876711f9d) --- stand/libsa/Makefile | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index a1b9bc32e025..f7d7778d5653 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -108,32 +108,6 @@ SRCS+= ${i} SRCS+= lz4.c CFLAGS.lz4.c+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/lz4 -# Create a subset of includes that are safe, as well as adjusting those that aren't -# The lists may drive people nuts, but they are explicitly opt-in -FAKE_DIRS=xlocale arpa -SAFE_INCS=a.out.h assert.h elf.h inttypes.h limits.h nlist.h setjmp.h stddef.h stdbool.h string.h strings.h time.h unistd.h uuid.h -STAND_H_INC=ctype.h fcntl.h signal.h stdio.h stdlib.h -OTHER_INC=stdarg.h errno.h stdint.h - -beforedepend: - mkdir -p ${FAKE_DIRS}; \ - for i in ${SAFE_INCS}; do \ - ln -sf ${SRCTOP}/include/$$i $$i; \ - done; \ - ln -sf ${SYSDIR}/${MACHINE}/include/stdarg.h stdarg.h; \ - ln -sf ${SYSDIR}/sys/errno.h errno.h; \ - ln -sf ${SYSDIR}/sys/stdint.h stdint.h; \ - ln -sf ${SRCTOP}/include/arpa/inet.h arpa/inet.h; \ - ln -sf ${SRCTOP}/include/arpa/tftp.h arpa/tftp.h; \ - for i in _time.h _strings.h _string.h; do \ - [ -f xlocale/$$i ] || :> xlocale/$$i; \ - done; \ - for i in ${STAND_H_INC}; do \ - ln -sf ${SASRC}/stand.h $$i; \ - done -CLEANDIRS+=${FAKE_DIRS} -CLEANFILES+= ${SAFE_INCS} ${STAND_H_INC} ${OTHER_INC} - # io routines SRCS+= closeall.c dev.c ioctl.c nullfs.c stat.c mount.c \ fstat.c close.c lseek.c open.c read.c write.c readdir.c preload.c @@ -210,4 +184,30 @@ SRCS+= explicit_bzero.c crc32_libkern.c MAN=libsa.3 .endif +# Create a subset of includes that are safe, as well as adjusting those that aren't +# The lists may drive people nuts, but they are explicitly opt-in +FAKE_DIRS=xlocale arpa +SAFE_INCS=a.out.h assert.h elf.h inttypes.h limits.h nlist.h setjmp.h stddef.h stdbool.h string.h strings.h time.h unistd.h uuid.h +STAND_H_INC=ctype.h fcntl.h signal.h stdio.h stdlib.h +OTHER_INC=stdarg.h errno.h stdint.h + +beforedepend: + mkdir -p ${FAKE_DIRS}; \ + for i in ${SAFE_INCS}; do \ + ln -sf ${SRCTOP}/include/$$i $$i; \ + done; \ + ln -sf ${SYSDIR}/${MACHINE}/include/stdarg.h stdarg.h; \ + ln -sf ${SYSDIR}/sys/errno.h errno.h; \ + ln -sf ${SYSDIR}/sys/stdint.h stdint.h; \ + ln -sf ${SRCTOP}/include/arpa/inet.h arpa/inet.h; \ + ln -sf ${SRCTOP}/include/arpa/tftp.h arpa/tftp.h; \ + for i in _time.h _strings.h _string.h; do \ + [ -f xlocale/$$i ] || :> xlocale/$$i; \ + done; \ + for i in ${STAND_H_INC}; do \ + ln -sf ${SASRC}/stand.h $$i; \ + done +CLEANDIRS+=${FAKE_DIRS} +CLEANFILES+= ${SAFE_INCS} ${STAND_H_INC} ${OTHER_INC} + .include