From nobody Fri Feb 02 21:04:52 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 4TRSvm4PlDz58GhY; Fri, 2 Feb 2024 21:04:52 +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 4TRSvm3vckz53gx; Fri, 2 Feb 2024 21:04:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706907892; 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=zfW5D5ClLwBUTUeiMLewDh6kx3R9C0ET1v/ZC1CmGCM=; b=AGlCqBZMVx0P08id/bkIekqOCp85McrVnxxrBA/+YyiOlE9xHYXOIfgv31RPZTiD6dtApd 484fiYpl4sjLYoJP9qhfyi6IGFH693ehFectMjfuvemMbdyqnl6/j0o+7lBxKg7kIWirUn /Q/FK0uS7TjmHSFIa6fKDpI1wrFg/6QHgeuFCqhPHnhuIkHl20RziWZuCjqU6H2jAz2DSz hhY1NpbdWAiOAtFVkL1n9r7Ole2lN4SyTGiE1j2r9uLG14DUnMokmdWnpeUyCBm1JI/oZ+ RhgoPmquPJnCfXmouvGqfzaaqbjX5SrsP5hIiSx15PPFtFqn5q2QIBTFhbJ+bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706907892; 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=zfW5D5ClLwBUTUeiMLewDh6kx3R9C0ET1v/ZC1CmGCM=; b=DWthOX52wmW2HfgeB2aKMD3HUU/0o3/TcXFbg+8sPuYi2kfIFte7dte8MIBZnljEwdcZR6 yn5o0LpK5k37abyPi9/C6gL1w2SF1tYRKHIxbG88Ri2ZNCLP3yec1GXA5PITQaACxM73DC ir/a1R5h1XTFd21dMWFiK69p3nYrRA0MQDWKmjbXk+qqImyg9PMhKkEIACpeULkdFhysqJ tFc90pN/d7XjA952+tzv8XjREQkzsuuRbbu5C7WxK+Cs1B2c7ZUlO/RiJBzc4eLr3QZRkA IZugQQ1hEyIkfVKvuOAA9gANPsf8367om6iriPVrWkqUnKIbsh/KllXiM2e2kA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706907892; a=rsa-sha256; cv=none; b=ChfAyAEOnVbBCXhARmDdJDU760B/Toy9clImyVC4+OosKDk8SbzIqMz4dcuTUXCI6WYbIu RRe6KuecSH3AH8X6EPphxWgaoObGPMolaCYBtZqr6plqwTtYkQIRZyX/C6mHl7IrlOrcVf 2yW1Aw8G0MdpcK8SmLRsZ4VRjUvq465aE9uhNVsW4GZ1FCQ9yLr+4kLgHPLzZ/nFVgeDVN t/wjASa2pMISvd9ECiHXcTSVz6rkvz9uX+m8Mqqf2AhJq+HXvJSIeQ5UmV1B9FEyteXWia A9Om6v0T4ir0J5C2+XDOX3FI52mxHCW4lNk4ezURJJZqinswmK0VIZDFV6f9Mw== 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 4TRSvm2rPCzlml; Fri, 2 Feb 2024 21:04:52 +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 412L4qgT056258; Fri, 2 Feb 2024 21:04:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412L4qeW056255; Fri, 2 Feb 2024 21:04:52 GMT (envelope-from git) Date: Fri, 2 Feb 2024 21:04:52 GMT Message-Id: <202402022104.412L4qeW056255@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 7c8b126c1a7b - main - 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 7c8b126c1a7b30fe690800d7e27b308876711f9d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7c8b126c1a7b30fe690800d7e27b308876711f9d commit 7c8b126c1a7b30fe690800d7e27b308876711f9d Author: Warner Losh AuthorDate: 2024-01-31 23:42:49 +0000 Commit: Warner Losh CommitDate: 2024-02-02 21:01:03 +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 --- 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