From owner-dev-commits-src-all@freebsd.org Sun May 30 01:19:19 2021 Return-Path: Delivered-To: dev-commits-src-all@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 CA6D864C0B1; Sun, 30 May 2021 01:19:19 +0000 (UTC) (envelope-from jason.harmening@gmail.com) Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ft0vB5Mc6z4vJM; Sun, 30 May 2021 01:19:18 +0000 (UTC) (envelope-from jason.harmening@gmail.com) Received: by mail-pl1-x632.google.com with SMTP id v12so3421954plo.10; Sat, 29 May 2021 18:19:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:references:message-id:date:user-agent:mime-version :in-reply-to:content-language:content-transfer-encoding; bh=rkSfaLBLJ/zliehRJiveuF6KMbVehsPHexTO9PrXdUc=; b=IY2bpJ7nb2M5+ULAnkUtaoKuwyCDiB1CEMEzkW8Lgfb2fms5LwgJGdeY/mQDhk1Pmt q2s4l4YjbtyFHsGxvPJLtMpdS0ELEBziIpaznpyVcy34kYvdzy9BgicpYRW9LCZGU/r6 n5m8rwQTZVYENSVMEygkHpf+jEUhmN3PafMZdSa9eNLtt+7OZw38cpiLP/H54tuSZIuX tmsXD2/64zUR7zaIaAOcjThcVrMxnZHNXLTgwvoj/bd1hoLIAmKEXQx1HQF+TvNHQSMu FvxdJzpWbHDwrAqzPrRzEdKI88UFMRbAkpeuQCiaHptHKHweX7OGRa087Y+MKhfsCu7g l0Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=rkSfaLBLJ/zliehRJiveuF6KMbVehsPHexTO9PrXdUc=; b=Li9t/DEbC08ChuvTKpJiF+TE05ECUPqNDQekc+c70RKGcQnCK0LSbcUmVtXVXohw0R WXbsg+XiEb9n/O+t6uC+/k4hV4WMVs6zT/G0Zj79S3PFxhulq+KKFHwOpPPKTiaIRfwe rzHP/JBzhYMFw+3txNdwI4oSnEhHDfZxt6Z39GtVftaqFUjLJ+cU+urklOC5qLvXmZmg mNdyAKxIzV8NAKj5uMsOLM2vQd9z1ruK8QM+sxs4cfhfF2sAmuhSbPCTfT1i74uKov/a t1SvLJAD38qwuejj5Jp/5VA2FqIv+i7oDCBg2p6konPvffihWsWKEbimReKHLXlgTWUg /4og== X-Gm-Message-State: AOAM530lh/v8ucM4lFjyuzXV5y9pVvo2xUjpalOyonF838liT3KOYDiG l/oYooDR8VtsZQiCXAU/uEp8abv3m/17 X-Google-Smtp-Source: ABdhPJxpbk5xbmGQC0JUj8lUvyWGJMTj0oi844TJve2crXPXyz6wXzF/TsGSe4KIAMaM53O9e9hnUQ== X-Received: by 2002:a17:90a:3bc6:: with SMTP id e64mr12295481pjc.156.1622337557033; Sat, 29 May 2021 18:19:17 -0700 (PDT) Received: from [192.168.42.3] ([97.73.80.132]) by smtp.googlemail.com with ESMTPSA id b23sm7319885pjo.26.2021.05.29.18.19.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 29 May 2021 18:19:16 -0700 (PDT) Subject: Re: git: 54256e7954d7 - main - Fix userspace build after commit 6d3e78ad6c11 From: Jason Harmening To: Rebecca Cran , "Jason A. Harmening" , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202105292142.14TLg7ol096256@gitrepo.freebsd.org> <387f2176-0cb0-fcbc-1294-f2dfc0ffa9d7@bsdio.com> <556c2008-19b4-5c56-0c80-2e1c7f857608@gmail.com> Message-ID: Date: Sat, 29 May 2021 18:23:54 -0700 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: <556c2008-19b4-5c56-0c80-2e1c7f857608@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4Ft0vB5Mc6z4vJM X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=IY2bpJ7n; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of jasonharmening@gmail.com designates 2607:f8b0:4864:20::632 as permitted sender) smtp.mailfrom=jasonharmening@gmail.com X-Spamd-Result: default: False [-2.00 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::632:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; RECEIVED_SPAMHAUS_PBL(0.00)[97.73.80.132:received]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; NEURAL_SPAM_SHORT(1.00)[1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::632:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::632:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[dev-commits-src-main,dev-commits-src-all] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 May 2021 01:19:19 -0000 Ah, sys/types.h doesn't try to define bool unless bool isn't already defined *and* _KERNEL || STANDALONE is defined. The libprocstat offenders pull in a bunch of other system headers that pull in types.h before they fake-define _KERNEL, so there's never a chance for bool to be defined. And I should've known the "fix" of including stdbool was pointless, because the vfs_* function types obviously are only defined for kernel builds. So, it's either use _Bool or make libprocstat pay for its hackery by manually including stdbool.h. I'm kinda in favor of the latter:) On 5/29/21 5:53 PM, Jason Harmening wrote: > Actually that doesn't fix it, so I've reverted both commits for now. > I'm not sure what other BS is going on here. > > On 5/29/21 4:50 PM, Rebecca Cran wrote: >> On 5/29/21 3:42 PM, Jason A. Harmening wrote: >>> The branch main has been updated by jah: >>> >>> URL: >>> https://cgit.FreeBSD.org/src/commit/?id=54256e7954d7efeee53bd1ab4d08d0c772b55f4d >>> >>> >>> commit 54256e7954d7efeee53bd1ab4d08d0c772b55f4d >>> Author:     Jason A. Harmening >>> AuthorDate: 2021-05-29 21:45:09 +0000 >>> Commit:     Jason A. Harmening >>> CommitDate: 2021-05-29 21:45:42 +0000 >>> >>>      Fix userspace build after commit  6d3e78ad6c11 >>>      Reported by: jenkins >>> --- >>>   sys/sys/mount.h | 2 ++ >>>   1 file changed, 2 insertions(+) >>> >>> diff --git a/sys/sys/mount.h b/sys/sys/mount.h >>> index 684d8c3eb780..6c1cd82ee84f 100644 >>> --- a/sys/sys/mount.h >>> +++ b/sys/sys/mount.h >>> @@ -43,6 +43,8 @@ >>>   #include >>>   #include >>>   #include >>> +#else >>> +#include >>>   #endif >>>   /* >> >> I'm seeing this error even with this commit: >> >> >> --- lib/libprocstat__L --- >> In file included from /usr/src/lib/libprocstat/msdosfs.c:51: >> /usr/obj/usr/src/amd64.amd64/tmp/usr/include/sys/mount.h:765:7: error: >> unknown type name 'bool' >>                      bool *mp_busy); >>                      ^ >>