From nobody Fri Jul 8 17:49:59 2022 X-Original-To: dev-commits-src-main@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 0F69312AFBF5; Fri, 8 Jul 2022 17:50:00 +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 4Lfglq6gdqz47yB; Fri, 8 Jul 2022 17:49:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657302599; 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=MIIeR/qydyXvKw5YQCCxRhXY1FEYZvA82dTqYSme+OM=; b=LXQPUqhm6p/1fZbEusONbmC0GCrhZU6n4FDE9vsLi/AhzKMU3qI/pezYOIdXctcMTAMD1W Dgof8zb0OBFejbPFTjyp4EJyNHTpsNXE3gAID33Lz1IHTkDpBEPOSUgddqUf+2rXlAMCm7 5SVmbiOmz/jfWqY7qCiPCzmED7GYuihkp+5mOc4cPx4o5S/mg6hpkhHE9MAWpZhiMENTyB lMFYk4A8qsKjIjUyuecvzsaZO+hzpWz3LOWBMaAlQTHFqZM6gaItUiGlZXOyfp2aEYiAVZ 9RXqKui4OJBjcV0k/BUBwvAvciJmw6/Ap8mhVt+QN7VyClaMJhZv+EP54MSvqA== 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 4Lfglq5lSfzFXj; Fri, 8 Jul 2022 17:49:59 +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 268HnxkZ064381; Fri, 8 Jul 2022 17:49:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 268Hnxkj064380; Fri, 8 Jul 2022 17:49:59 GMT (envelope-from git) Date: Fri, 8 Jul 2022 17:49:59 GMT Message-Id: <202207081749.268Hnxkj064380@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: 285f6ab665d7 - main - stand: Separate out ZSTD sources from ZFS sources List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 285f6ab665d747ee4c35ed80590d5c4d171f130d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657302599; 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=MIIeR/qydyXvKw5YQCCxRhXY1FEYZvA82dTqYSme+OM=; b=by9IX7QhpZ4eu2N90u9Guvk5tJ2atWtwQ+jqze/1RJbC9pBGdVc2yJcj3Mo1NLo4yfN2S9 I+tgL6B8odF/vn+bX0co6DJOVfDHbMWPE/BTHwvd4oOxFfyn4Wuhq376gegaa3hwWjRLEi aeNRKqdX5x+cTu7GuZ0NidUuFrVioXs3MyG6x9kg6byBID2pH/vNAznAFT8YquiobvG+Dx wlLEb9vOvuPVIk4hXgP2nHVWlp5+hfMilF4tsdNdK9tMmua1G1TmmY5mdx1otWKAMcN8pK BuASZ1tNCRpy8ShEI/8ueZxiJHdWpi/B549XV3mHKIXyxPW5Z2tX/L256oR01w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657302599; a=rsa-sha256; cv=none; b=XTvuuTKBC8o8SYjyZP0oqBac37hAaq1XUaIN5q2O2Ph3asLYlWnu+leiHkz2ryPaG6pAgV pyIatEouKRRYwRxluZ4FKgD9PdDBf3otRmCl9lH8pUb/NCv4czb1RISvdUQgD1V/fUtH1a KetkySdHx6bSx4wC+J+YpteJjQKYSg2J3o/TNa7j1gClb8QeIuhsiT+IIrLEr4jTY1dtwv Y7hvuahOH7DPypCnZJwk6+zX38QjW/+G3BKiITtUWW1NgLTR0oQI50fVszikGZmT2ZqYkm ZQ6MS1YNyxmh75s1x8KUYsX5KgvrefvIyv1HF6dtKcVUrVJLdGp79FuQYCvQYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=285f6ab665d747ee4c35ed80590d5c4d171f130d commit 285f6ab665d747ee4c35ed80590d5c4d171f130d Author: Warner Losh AuthorDate: 2022-07-08 15:07:41 +0000 Commit: Warner Losh CommitDate: 2022-07-08 17:47:36 +0000 stand: Separate out ZSTD sources from ZFS sources Sponsored by: Netflix --- stand/libsa/zfs/Makefile.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc index d63e1582d2a3..ff8dfea195b5 100644 --- a/stand/libsa/zfs/Makefile.inc +++ b/stand/libsa/zfs/Makefile.inc @@ -8,17 +8,17 @@ .PATH: ${OZFS}/module/zstd/lib/decompress ZFS_SRC= zfs.c nvlist.c skein.c skein_block.c list.c ZFS_SRC+= zstd_shim.c -ZFS_SRC+= entropy_common.c error_private.c -ZFS_SRC+= fse_compress.c fse_decompress.c hist.c -ZFS_SRC+= huf_compress.c huf_decompress.c pool.c xxhash.c -ZFS_SRC+= zstd_common.c zstd_compress.c zstd_compress_literals.c -ZFS_SRC+= zstd_compress_sequences.c zstd_compress_superblock.c -ZFS_SRC+= zstd_ddict.c zstd_decompress.c zstd_decompress_block.c -ZFS_SRC+= zstd_double_fast.c zstd_fast.c zstd_lazy.c zstd_ldm.c -ZFS_SRC+= zstd_opt.c +ZSTD_SRC+= entropy_common.c error_private.c +ZSTD_SRC+= fse_compress.c fse_decompress.c hist.c +ZSTD_SRC+= huf_compress.c huf_decompress.c pool.c xxhash.c +ZSTD_SRC+= zstd_common.c zstd_compress.c zstd_compress_literals.c +ZSTD_SRC+= zstd_compress_sequences.c zstd_compress_superblock.c +ZSTD_SRC+= zstd_ddict.c zstd_decompress.c zstd_decompress_block.c +ZSTD_SRC+= zstd_double_fast.c zstd_fast.c zstd_lazy.c zstd_ldm.c +ZSTD_SRC+= zstd_opt.c CFLAGS+= -DHAS_ZSTD_ZFS -SRCS+= ${ZFS_SRC} +SRCS+= ${ZFS_SRC} ${ZSTD_SRC} CFLAGS+= -I${LDRSRC} CFLAGS+= -I${SYSDIR}/cddl/boot/zfs @@ -28,7 +28,7 @@ ZFS_EARLY= -I${ZFSOSINC} \ -I${ZFSOSINC}/spl \ -I${ZFSOSINC}/zfs -.for i in ${ZFS_SRC} +.for i in ${ZFS_SRC} ${ZSTD_SRC} CFLAGS.$i+= -include ${ZFSOSINC}/spl/sys/ccompile.h .endfor