From owner-dev-commits-src-main@freebsd.org Tue Jun 8 20:21:54 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EB87A63DA6E; Tue, 8 Jun 2021 20:21:54 +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 4G01qQ69CKz4k6j; Tue, 8 Jun 2021 20:21:54 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 BC4D772EA; Tue, 8 Jun 2021 20:21:54 +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 158KLsPF065729; Tue, 8 Jun 2021 20:21:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 158KLscZ065728; Tue, 8 Jun 2021 20:21:54 GMT (envelope-from git) Date: Tue, 8 Jun 2021 20:21:54 GMT Message-Id: <202106082021.158KLscZ065728@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: f20893853e8e - main - zfs: unbreak build broken in 160388166 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f20893853e8e6909d422f6646b706b4b6e299682 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2021 20:21:55 -0000 The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=f20893853e8e6909d422f6646b706b4b6e299682 commit f20893853e8e6909d422f6646b706b4b6e299682 Author: Martin Matuska AuthorDate: 2021-06-08 17:02:21 +0000 Commit: Martin Matuska CommitDate: 2021-06-08 20:21:11 +0000 zfs: unbreak build broken in 160388166 --- cddl/lib/libspl/Makefile | 28 ++++++++-------------------- cddl/lib/libuutil/Makefile | 2 -- cddl/lib/libzfs/Makefile | 5 ++--- cddl/usr.bin/Makefile | 2 -- cddl/usr.bin/zstream/Makefile | 3 +++ cddl/usr.bin/zstreamdump/Makefile | 11 ----------- cddl/usr.bin/zstreamdump/Makefile.depend | 25 ------------------------- lib/libbe/Makefile | 1 + 8 files changed, 14 insertions(+), 63 deletions(-) diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile index 8088ef497d46..f565683fba4e 100644 --- a/cddl/lib/libspl/Makefile +++ b/cddl/lib/libspl/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl -.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl/os/freebsd .PATH: ${SRCTOP}/sys/contrib/openzfs/include @@ -11,11 +10,13 @@ PACKAGE= runtime SRCS = \ assert.c \ + getexecname.c \ list.c \ mkdirp.c \ + os/freebsd/getexecname.c \ + os/freebsd/zone.c \ page.c \ timestamp.c \ - zone.c \ include/sys/list.h \ include/sys/list_impl.h @@ -23,25 +24,12 @@ SRCS = \ # will not compile when building on macOS. .if !defined(BOOTSTRAPPING) SRCS += \ - getexecname.c \ - gethostid.c \ - getmntany.c \ - mnttab.c - - -.if ${MACHINE_ARCH} == "amd64" -.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl/asm-x86_64 -SRCS += atomic.S -.elif ${MACHINE_ARCH} == "i386" -.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl/asm-i386 -SRCS += atomic.S -.else -.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl/asm-generic -SRCS += atomic.c -.endif + atomic.c \ + os/freebsd/gethostid.c \ + os/freebsd/getmntany.c \ + os/freebsd/mnttab.c .endif - WARNS?= 2 CSTD= c99 CFLAGS+= -DIN_BASE @@ -53,6 +41,6 @@ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h -CFLAGS.atomic.S+= -DLOCORE +CFLAGS.atomic.c+= -Wno-error-atomic-alignment .include diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile index 76567b50c610..169b8d8afe01 100644 --- a/cddl/lib/libuutil/Makefile +++ b/cddl/lib/libuutil/Makefile @@ -7,11 +7,9 @@ LIB= uutil SRCS=\ uu_alloc.c \ uu_avl.c \ - uu_dprintf.c \ uu_ident.c \ uu_list.c \ uu_misc.c \ - uu_open.c \ uu_pname.c \ uu_string.c diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index b159955c0212..6de09d1b7333 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -5,7 +5,6 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs/os/freebsd .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libshare -.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libshare/os/freebsd .PATH: ${SRCTOP}/sys/contrib/openzfs/include .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib @@ -53,8 +52,8 @@ USER_C += \ USER_C += \ libshare.c \ nfs.c \ - smb.c - + os/freebsd/nfs.c \ + os/freebsd/smb.c KERNEL_C = \ algs/sha2/sha2.c \ diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile index 5c2595df1c9f..10d55215c0b3 100644 --- a/cddl/usr.bin/Makefile +++ b/cddl/usr.bin/Makefile @@ -8,7 +8,6 @@ SUBDIR= \ ctfmerge \ ${_zinject} \ ${_zstream} \ - ${_zstreamdump} \ ${_ztest} SUBDIR.${MK_TESTS}+= tests @@ -17,7 +16,6 @@ SUBDIR.${MK_TESTS}+= tests _zinject= zinject _ztest= ztest _zstream = zstream -_zstreamdump = zstreamdump .endif SUBDIR_PARALLEL= diff --git a/cddl/usr.bin/zstream/Makefile b/cddl/usr.bin/zstream/Makefile index d6ac8c5f3b16..ac3bfeb68cf4 100644 --- a/cddl/usr.bin/zstream/Makefile +++ b/cddl/usr.bin/zstream/Makefile @@ -7,6 +7,7 @@ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs PROG= zstream MAN= zstream.8 +MLINKS= zstream.8 zstreamdump.8 INCS= zstream.h SRCS= \ zstream.c \ @@ -14,6 +15,8 @@ SRCS= \ zstream_redup.c \ zstream_token.c +LINKS= ${BINDIR}/zstream ${BINDIR}/zstreamdump + WARNS?= 2 CFLAGS+= \ -DIN_BASE \ diff --git a/cddl/usr.bin/zstreamdump/Makefile b/cddl/usr.bin/zstreamdump/Makefile deleted file mode 100644 index 63f365d0445a..000000000000 --- a/cddl/usr.bin/zstreamdump/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -ZFSTOP= ${SRCTOP}/sys/contrib/openzfs - -.PATH: ${ZFSTOP}/cmd/zstreamdump -.PATH: ${ZFSTOP}/man/man8 - -SCRIPTS= zstreamdump -MAN= zstreamdump.8 - -.include diff --git a/cddl/usr.bin/zstreamdump/Makefile.depend b/cddl/usr.bin/zstreamdump/Makefile.depend deleted file mode 100644 index 3089536f9717..000000000000 --- a/cddl/usr.bin/zstreamdump/Makefile.depend +++ /dev/null @@ -1,25 +0,0 @@ -# $FreeBSD$ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - cddl/lib/libavl \ - cddl/lib/libnvpair \ - cddl/lib/libumem \ - cddl/lib/libzpool \ - gnu/lib/csu \ - include \ - include/xlocale \ - lib/${CSU_DIR} \ - lib/libc \ - lib/libcompiler_rt \ - lib/libmd \ - lib/libthr \ - lib/libz \ - lib/msun \ - - -.include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/lib/libbe/Makefile b/lib/libbe/Makefile index d1fab41578bf..50a8f8f56fb2 100644 --- a/lib/libbe/Makefile +++ b/lib/libbe/Makefile @@ -58,6 +58,7 @@ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h