From nobody Tue Jan 24 22:10:40 2023 X-Original-To: dev-commits-src-branches@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 4P1h4J620xz3bf3y; Tue, 24 Jan 2023 22:10:40 +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 4P1h4J5DfXz4KsD; Tue, 24 Jan 2023 22:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598240; 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=0J9U1BdX3bgeupaxhHb5zLFnzDZJq5F1qj14e0ohYps=; b=Zy0+OAp8EiJ/CtgMxV7HrcG2LtxznKOtMceyZ+EuaXoOXuNO/NoJW83lQsxlyiu+hVOUTB ROf2MpLVglJqHGuYNK0nHLkuV7fDS/Cc+2QkwqfGI/35+EyAJPDMAhn2ig+9P+j4Q1KvhK 5BdhVR3CqpnA/vKf/tDPgiy9sX0ZCGHdmknK/z5fRf6kszeGB3mAx2hHFzVQVDb7G8cqv+ G2nkLmU9hpMgUJRQOxps++oNQH5zkGK1Fc+e49EylJLCjzH8uak4IIgVceDm078KfIAc7Z cWpCpdA4mV7cLXspZSKtbSwWFh4D1PhN3QmR5BrloDjEipMtfgThCYmO5DalHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598240; 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=0J9U1BdX3bgeupaxhHb5zLFnzDZJq5F1qj14e0ohYps=; b=QRxT1Yl/wICZYm1KZxiR8/mFeVwkcW1IzvBhFFb7kNF4ON1Gyd+mzI1Y5K43OlEywPij+b j1eGPcWyFLxN1POsz203V5ufouy2MFSaj+FLT3EKsGnJ+XD+TL4RLz+ekg17SF/KTxl0xV xbbUCoEvk1S1V24AxcNmP5aNY5FhDMEIvmmES5i3r9w34TQ2wH3V3jcj9Ei1Exh7oAUvaU WFi8HZ1hZFjQhrDae7BoHKCiJKyFvb3t+FEaRkj4wqoKlYwAygT0ERi1IhOXktOU7nIsaJ 732ekUCjdnZJsXuXWd6JC54+C618wq4PNhQzNfXUjvAQOxLSuMTNEw1GIFhTTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598240; a=rsa-sha256; cv=none; b=igZTSOSYahF7WkPqE+AK5NncuNISyh5jA66096s8SX4EDWTPZuyJ1XXmurdD375fpsztfU r7VmwcVOVmH0VomuIgeVRQgS64aBUIlpTAGBHqaskrCfnsI/RefQVvp2MY/qYx2BJ5z3p9 2IWsDyRBKevAvskpw30StmofUgAHg00mmvPDdDucmCqekOM9PdhoNQiUcDqxK0Q+IaG6Vq 77Lapr9tscbLyqdRDE81bVXUxx2pq7DI+ShIjYNcTwm+O6vnnGgaxYp2zfr3wrFpV3dL1N kYtihj0pBxarG1nFDjfaaJn5OQ7C4aaKQ5qsKaQyaWTgAY6UciVZu6t7GlmuYg== 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 4P1h4J4JBLzQTH; Tue, 24 Jan 2023 22:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMAeSp080380; Tue, 24 Jan 2023 22:10:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMAeKs080379; Tue, 24 Jan 2023 22:10:40 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:10:40 GMT Message-Id: <202301242210.30OMAeKs080379@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: c5bb7c22ba40 - stable/13 - stand: Don't reuse ZFSSRC List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: c5bb7c22ba4075fece3662a77b77cd4534b72ea7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c5bb7c22ba4075fece3662a77b77cd4534b72ea7 commit c5bb7c22ba4075fece3662a77b77cd4534b72ea7 Author: Warner Losh AuthorDate: 2022-07-08 15:03:45 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:22 +0000 stand: Don't reuse ZFSSRC ZFSSRC is the top level directory where the ZFS sources come from. Don't reuse it for a list of ZFS sources. Instead, use ZFS_SRC Sponsored by: Netflix (cherry picked from commit f424b167a317b37ba7626e11002ca00dcc03f661) --- stand/libsa/zfs/Makefile.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc index 00839c05d37d..b503f6d20e86 100644 --- a/stand/libsa/zfs/Makefile.inc +++ b/stand/libsa/zfs/Makefile.inc @@ -4,10 +4,10 @@ .PATH: ${SYSDIR}/crypto/skein .PATH: ${ZFSOSSRC}/spl .PATH: ${OZFS}/module/zstd/lib -ZFSSRC= zfs.c nvlist.c skein.c skein_block.c list.c -ZFSSRC+= zstd_shim.c zstd.c +ZFS_SRC= zfs.c nvlist.c skein.c skein_block.c list.c +ZFS_SRC+= zstd_shim.c zstd.c CFLAGS+= -DHAS_ZSTD_ZFS -SRCS+= ${ZFSSRC} +SRCS+= ${ZFS_SRC} CFLAGS+= -I${LDRSRC} CFLAGS+= -I${SYSDIR}/cddl/boot/zfs @@ -17,7 +17,7 @@ ZFS_EARLY= -I${ZFSOSINC} \ -I${ZFSOSINC}/spl \ -I${ZFSOSINC}/zfs -.for i in ${ZFSSRC} +.for i in ${ZFS_SRC} CFLAGS.$i+= -include ${ZFSOSINC}/spl/sys/ccompile.h .endfor