From nobody Mon Apr 18 12:00:59 2022 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 C55AC11D6909; Mon, 18 Apr 2022 12:01: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 4KhlrX0QgGz3n1R; Mon, 18 Apr 2022 12:00:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650283260; 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=UiEZqFU+ITYpR6ABWUNrECfrjaun+3BVivVLEQHIZcY=; b=yrudyamQV55OViHU0jTJ0GBD1beLnXlMmgygn3nvwgpFwNbPWv6+hnSxV8WRZwwuKU7RGw zRePzzeiP67hyn4ku+Rm/EudfUQdKiZW0UwHihRJfIsJjmIGdRhDBExplvMpHs1RHjUQxI 2wUCMWSjCmR7a3bfpILkQDWKrtZ9rOC06EqEp2ySMwdPqirNBmHS8wYfBDQOAqDJovbXT8 fsxHDZ49iSUJwTKv71BoVeI3rwMQZCrDCEdas3irHhR6IWOr6SBqJeFNhGWu1i0Q3SFmCm +WKFz6ydtJRf/LBsuZnvFh4TBZ828uQiAsO4NkA6bPP47/tPuXs1UNKFMW336g== 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 4DC5B12444; Mon, 18 Apr 2022 12:00: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 23IC0xB4018151; Mon, 18 Apr 2022 12:00:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23IC0xJd018150; Mon, 18 Apr 2022 12:00:59 GMT (envelope-from git) Date: Mon, 18 Apr 2022 12:00:59 GMT Message-Id: <202204181200.23IC0xJd018150@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Stefan E=C3=9Fer?= Subject: git: 7dfb8f15e269 - stable/12 - bin/df: fix build with MOUNT_CHAR_DEVS defined 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: se X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 7dfb8f15e2692a16c4e1bba4b8cb5c5d85f5cfe1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650283260; 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=UiEZqFU+ITYpR6ABWUNrECfrjaun+3BVivVLEQHIZcY=; b=TyKXtB3b9kKKMwmAINcdJKBxpgae3xr9xg2B2GY9F8z9n+CjMTGXSDCO0sbUQ8v9BaZ+sX f0QqmRegABvdg7l4sFz5R32yIn7aI49BII+qx71lEQI6AgUmVr5ZAo1mONP9IvhStUBCmi YblVlU/FbGQu5DLLaS6nxO/kn2tCz/n2o8Bn9XhIOdvHSdSRajhLjPYzHwOQv+WtORuj02 nPOY3v/s7h0HkEhgDAvHnCDTQixRoYjYXXZBgrmjbUEhMVfQJ24xwJwhlPZSsaE9SOuM6i HpCLZu8wp/Aihnhyg1g5FaIlGjfnpWdpFenN0XYrFAUbtwMOh+s2c1ZEkJIjUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650283260; a=rsa-sha256; cv=none; b=dpzMhxGC8MGVxioNKt35cEAVggnYktSRQvjjGkFlaXetxX5M8QqNf8MYE/BjatnMKSAvqw hS4lpci4uUgkRzjxarKC0BmTyxolQGYQcECWN+CeMN7ZnWCLraoiJxxKGC61fM2teGO1Il koYk3MbYJ+/fmItClIOFnysQDdQZOl/rEruKTGug0H4plAKvD+W2yQ5gXaLukrphJoACty OAGKnd8ExhyKuuvGULVvhFddXGnjMvMzKukPYIbHxbT0UrKfHbqzLjcb4rL60H8nLfcdfd BpO/s+g2uM20kMmL+IWAm3dwYREUfnRpPPaODRk0NEOlOivzamgl2IBaMPv/Xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=7dfb8f15e2692a16c4e1bba4b8cb5c5d85f5cfe1 commit 7dfb8f15e2692a16c4e1bba4b8cb5c5d85f5cfe1 Author: Stefan Eßer AuthorDate: 2022-04-18 11:56:38 +0000 Commit: Stefan Eßer CommitDate: 2022-04-18 12:00:33 +0000 bin/df: fix build with MOUNT_CHAR_DEVS defined When resolving conflicts due to the unmergewd commit that removed the code previously made conditional on MOUNT_CHAR_DEVS, I failed to see that MOUNT needed to be defined in the Makefile and that the include of mntopts.h was still required for that case. Fix the build by adding back the missing definitions to the Makefile. --- bin/df/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/df/Makefile b/bin/df/Makefile index 52eab0abfc1a..bf1c72b884ac 100644 --- a/bin/df/Makefile +++ b/bin/df/Makefile @@ -2,10 +2,12 @@ # $FreeBSD$ PACKAGE=runtime +MOUNT= ${.CURDIR}/../../sbin/mount PROG= df SRCS= df.c +CFLAGS+= -I${MOUNT} CFLAGS+= -DMOUNT_CHAR_DEVS LIBADD= xo util