From nobody Thu Mar 09 17:30:05 2023 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 4PXbmH2NQfz3x9WN; Thu, 9 Mar 2023 17:30:07 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PXbmH1vMDz4GXX; Thu, 9 Mar 2023 17:30:07 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678383007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rJ+EKFaXPAh2pk+Dj3JgEqVIM1EgDiFUFkEdRhD/X4c=; b=vZBEcQQ6AwZGpTkrWkQrpJDEhhxQNMz6xQQRJMhxjjFkeYl/lACVmLIh/TjcyYmMVALFpm 6zw/YFJd8IMdVY9oCNjvTTjwtGBC1HGj6Mb68ZhQOLK8A44YB6cqvfSqRjvBM+99VW9/Lj +S98OTOpUJF2Vs88Rw8I3ennECoj3qoAtjFPhVxYanL4U8ol0hkG626Xtj2bIbWw9kTPRN 0FdoXdaHiA1N8jM8cC2tJwEF5WJfCEUT5kUooBNib1tgMNdcyOs8LzTgEaNaL8sWs0uMfC ulNF8YJCj9rDfXHQELFvp/LX9tyaWL7ph63mWtYXO0kCa7wCSrQYgwEjq+CUlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678383007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rJ+EKFaXPAh2pk+Dj3JgEqVIM1EgDiFUFkEdRhD/X4c=; b=sBhT/A996GryBjD1RHyqr7esNWQDEPl6nBnfEzQ6riWoiXwuWy6kdrGWOmJIwwNAubaO0r q7qhL0oP2l6iJxZkw/Hi2RqlEggxs/WSfJRBNv7CKC8LI42mE8XgwhaJ3G235EC3cdsLZ5 p/OMcr3KrobsbFENKVUc28FRy1Mndw76LIIAjRLJSQS8mtOPe+yvBhZiCy723tPWOnchTg g2Uhpv54vOgcSCAdx81Sr5vmbYoW6Gm4ND7m+IY+NilaNiFntfDTJKGVbxWh5/FcFnxkn5 CSITDiwfkLTZo6iCy5pqzscJ1gFUaT0LXuhf8X8mPRJvIbf16lsSW1pb/BO7Og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678383007; a=rsa-sha256; cv=none; b=El7uPOt2It8GeES3Zxji+G5PJ3Kks1m/H6qd8lthPHXzIJWcpLp6PS8uhNCIhDOQKNXVOP RXbHtK2d5S30ZU+vreFOdwZChoRTgHtloUw6EWVmancc/otKJ8/HYFC2tfM+0OQvpxPl45 /LjwcLq3QQdn5hG+bbEZCHkjS8ka6shKAhPbqf9f0oAIvqtjjnbzjTeG/C5PZBDWRR4CnB 0gLf7CRDLvNXLgQb1pMwGO7kuMuiiinX+MalMmKMLM+UtnohJ/s42s+nZAoIZVplGOn4b8 Ev5AGvdVXx2p97LO+XZowQ24ljSDxoYkoyfsGOq2KeILggB3p6MfIPIbelKGYQ== Received: from [IPV6:2601:648:8680:16b0:f07c:89ba:6199:d0c4] (unknown [IPv6:2601:648:8680:16b0:f07c:89ba:6199:d0c4]) (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 did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PXbmG43bpzZSF; Thu, 9 Mar 2023 17:30:06 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <7a33ffb1-f46f-fd57-b142-fc8641d923df@FreeBSD.org> Date: Thu, 9 Mar 2023 09:30:05 -0800 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 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Content-Language: en-US To: Ed Maste , Warner Losh Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202303082331.328NViDn050541@gitrepo.freebsd.org> From: John Baldwin Subject: Re: git: c581962414ed - main - src.conf.5: Add some WITH_/WITHOUT_ option descriptions In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ThisMailContainsUnwantedMimeParts: N On 3/9/23 7:10 AM, Ed Maste wrote: > On Wed, 8 Mar 2023 at 23:12, Warner Losh wrote: >> >> Yea, there's no reason to have the description twice... > > It looks like the ones that have both WITH_ and WITHOUT_ descriptions are: > > ATM AUTO_OBJ BIND_NOW CLANG CLANG_BOOTSTRAP CLANG_FULL CXGBETOOL > DEBUG_FILES EFI FDT GCC GCC_BOOTSTRAP GCOV GDB GH_BC GNU_DIFF > GOOGLETEST HYPERV KERNEL_RETPOLINE LIB32 LLD LLD_BOOTSTRAP LLD_IS_LD > LLDB LLVM_ASSERTIONS LLVM_COV LLVM_CXXFILT LLVM_TARGET_AARCH64 > LLVM_TARGET_ALL LLVM_TARGET_ARM LLVM_TARGET_MIPS LLVM_TARGET_POWERPC > LLVM_TARGET_RISCV LLVM_TARGET_SPARC LLVM_TARGET_X86 LOADER_GELI > LOADER_KBOOT LOADER_LUA LOADER_OFW LOADER_UBOOT MALLOC_PRODUCTION > MLX5TOOL MODULE_DRM MODULE_DRM2 NVME OFED OPENMP OPENSSL_KTLS PIE > PROFILE RELRO REPRODUCIBLE_BUILD RETPOLINE SENDMAIL SHARED_TOOLCHAIN > SSP STATS SYSTEM_COMPILER SYSTEM_LINKER TCP_WRAPPERS UNIFIED_OBJDIR > USB_GADGET_EXAMPLES ZFS > > although not all of them are used (the ones that default on across all > architectures). > > Looking at src.conf.5 the duplicates I see are: > > CXGBETOOL EFI FDT HYPERV LIB32 LLDB LOADER_GELI LOADER_KBOOT > LOADER_LUA LOADER_OFW LOADER_UBOOT MLX5TOOL NVME OFED OPENMP > OPENSSL_KTLS PIE ZFS > > Perhaps for these cases we can just skip the negative sense > (WITHOUT_), just listing the architectures it applies to? > > Something like: > > WITH_CXGBETOOL > Build cxgbetool(8) > > This is the default setting on amd64/amd64, arm64/aarch64, > i386/i386, powerpc/powerpc64 and powerpc/powerpc64le. > > WITHOUT_CXGBETOOL is the default setting on amd64/amd64, > arm64/aarch64, i386/i386, powerpc/powerpc64 and > powerpc/powerpc64le. My first thought was your first suggestion (a single FOO file that permitted a common prefix for the with/without cases). However, your second suggestion above is also fine and is probably easier to implement? The other wrinkle is that we don't really handle BROKEN_OPTIONS ideally. We just list the FOO option as defaulting to WITHOUT without telling the user that actually it will fail to build if you enable it. Not sure how much work that would be to fix. -- John Baldwin