From nobody Fri Dec 15 00:42:47 2023 X-Original-To: dev-commits-src-all@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 4Srr6H5ZD5z541dT; Fri, 15 Dec 2023 00:42:47 +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 4Srr6H4TNHz3YJp; Fri, 15 Dec 2023 00:42:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702600967; 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=G0P7zZSyJINq0FL21tDW2xUmfgpKtoTOUHMPudBMyjM=; b=YvZbx3uOasIw5bUIROs9xfAkEHqel6cIzwoOxRaFS1Ye11iXD+Ft6Bpc/k+566XY+slud2 9IjYqnDzwec513oMahFAwRyQEJNFwmtMcl/L8vnBeeD9ryYrdLj/1DtoW3OUeyc6yJsnk3 0vyXbByI4QuLPyOJ/YikkfjfuwA0hRWbnayPjh3RyRwreuPwOz3wU5qoysa3lp/Sj8cCy4 beoa16OK3mwmwyz8CR3V/fgDc5Jvssl5b7nmGoC/gA/gpUD20wuznvCb+CccSCGz2zewa/ eI559kv6ki3xuTnyAABtV/J83tJf2Tuw7nPVKvPbzwmoTRijDwZw8tNhQErmNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702600967; a=rsa-sha256; cv=none; b=I7f7TQQyVJO/fSDTpLGz3NIKIz2MEBjjTosF46KYy6R9ys2k0uKN88/QDy8ccSJIv2NHVU piZaF+KvlkypOk0XHbugO+tf9Ekwx64894WAkoafYIBc9NMKl3EOLYadJ0Zs7zK903v62P XmGZx6/sAkcM8ggYPcUqMdOQF7SOluQ3a7U/dg7IHBAr0+6hN6GtrITnNZyYPvHNnKvQkq 5tlkuy9A53niNdos5lnsXsf9B8FqUUtZCrwj4iV/AQLYK61ksIrGlXjDKDttEC88knNZWY ydCbZNXJKflwfugqVeznZcRLiXENjXXb8qoyvxWjZ+pf14VMKFN+5r1T6LeI7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702600967; 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=G0P7zZSyJINq0FL21tDW2xUmfgpKtoTOUHMPudBMyjM=; b=U3b5JFGwVVt1vbQXGnz56kk60ro72HIJouJPA5q+JH8ZLCQ8vFZ3WPreXLDuy9TN8jlTv2 Pwy0fXOO+dZ5GWSq4YsY7m7Gcm7SIeGqag6lixmi/7laZFy2v+BluT8p3NSCT2rFMLjaPj spePyMfxaxqoIMTJn8Iqdm6cXrUNS6y9iuxA89wcMsWhmgjWuVCqbped8HjjWDGqizUAEv cFjTq4rYIjSkBpznuom7ELe++8O7ET4y6fYMG5h8LUdS6OmrqpHFGUVVvlBsWYfm43Kefd 1dVKjKzqgSHO3xPVepd5HAv5ELWq5FdINXcVte7QYcnhnBpiD5PTH2pH/qtKmQ== 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 4Srr6H3FXVzq7P; Fri, 15 Dec 2023 00:42:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BF0glRM093502; Fri, 15 Dec 2023 00:42:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BF0gl2D093499; Fri, 15 Dec 2023 00:42:47 GMT (envelope-from git) Date: Fri, 15 Dec 2023 00:42:47 GMT Message-Id: <202312150042.3BF0gl2D093499@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 431d8b78ed26 - stable/14 - sort: Only build FreeBSD-specific ALTMON_x stuff when ATLMON_1 is defined List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 431d8b78ed262af910656930d96088f5a1d90485 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=431d8b78ed262af910656930d96088f5a1d90485 commit 431d8b78ed262af910656930d96088f5a1d90485 Author: Warner Losh AuthorDate: 2023-12-07 20:27:07 +0000 Commit: Christos Margiolis CommitDate: 2023-12-15 00:42:35 +0000 sort: Only build FreeBSD-specific ALTMON_x stuff when ATLMON_1 is defined On MacOS, we bootstrap sort. Since ALTMON_* are not defined there, the build blows up. Since we don't need this feature for the FreeBSD build process, and since we won't use it unless we actually install the NL files that have this data in it, just #ifdef it out for now. In the extremely unlikely event that the FreeBSD bootstrap/build process grows this dependency, we can evaluate the best solution then (which most likely is going to be not depend on the local's month names). Fixes: 3d44dce90a69 (MacOS builds and github CI) Sponsored by: Netflix Reviewed by: jrtc27, jlduran@gmail.com, markj Differential Revision: https://reviews.freebsd.org/D42868 (cherry picked from commit bd234c0d4c8256db7e5a1fdda9ef311c9e0080e4) --- usr.bin/sort/bwstring.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/usr.bin/sort/bwstring.c b/usr.bin/sort/bwstring.c index b0c14e996b23..10679fe631ba 100644 --- a/usr.bin/sort/bwstring.c +++ b/usr.bin/sort/bwstring.c @@ -113,9 +113,11 @@ initialise_months(void) const nl_item ab_item[12] = { ABMON_1, ABMON_2, ABMON_3, ABMON_4, ABMON_5, ABMON_6, ABMON_7, ABMON_8, ABMON_9, ABMON_10, ABMON_11, ABMON_12 }; +#ifdef ALTMON_1 const nl_item alt_item[12] = { ALTMON_1, ALTMON_2, ALTMON_3, ALTMON_4, ALTMON_5, ALTMON_6, ALTMON_7, ALTMON_8, ALTMON_9, ALTMON_10, ALTMON_11, ALTMON_12 }; +#endif int i; /* @@ -132,9 +134,13 @@ initialise_months(void) if (!populate_cmonth(&cmonths[i].ab, ab_item[i], i)) continue; +#ifdef ALTMON_1 if (!populate_cmonth(&cmonths[i].alt, alt_item[i], i)) continue; +#else + cmonths[i].alt = NULL; +#endif } } @@ -148,9 +154,13 @@ initialise_months(void) if (!populate_wmonth(&wmonths[i].ab, ab_item[i], i)) continue; +#ifdef ALTMON_1 if (!populate_wmonth(&wmonths[i].alt, alt_item[i], i)) continue; +#else + wmonths[i].alt = NULL; +#endif } } }