From nobody Thu Dec 7 20:43:30 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 4SmR7R05J3z53ZmS; Thu, 7 Dec 2023 20:43:31 +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 4SmR7Q6jR1z4v5f; Thu, 7 Dec 2023 20:43:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701981810; 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=sAjZtfTIJkQ2gV1rAtKpgsvLqzbKeUcPmb44Ts0UmLo=; b=JvXbnrvah7oqUVpaeSeapYqIrfrhwXr3Zc5yR17HR3vVVqUzYgDPugH5AAhBmb7CxGNLQg GWma5xFpzyDqUM0S2YTvWUx4sAHc8dy49LXILekOSSJEMF6ImOmygrek6dtcKTI+LIpJsV 1fdvWEFaHJauVTr7DklmnBrVuH3k16xTIEew4mlNwZn+Ul/500I4ED2ergZirl7MoBgJUa 2XwHt1A+7xz6gyERMZbndTJtJTWVSqsg3tvth+gTgrKS5W//KniWG0FerzeL8s1giR3MLA CxOeBYHIUwRvNA95eVkZ0sJUUJgGacrpOULvpFfg9uDovXG/130teLe6lK/c4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701981810; a=rsa-sha256; cv=none; b=YgQ3QdfOYmbeIh/cZws0nYz5zShnkTttnTBAMixZ3NGEp5jm3AHwhmMLhFJn3gEoKUHOsU TgpHRIbjZhUrXOOjzAD398X/VOJTgus5yS2ZljzFM3cA4aOrZH9FK81wW0H5zi8bNEVGMn KzDvXnH6uz/h9EFw6Ai1jkBU7iPhIl8ewumhyO4VVBBc9twIkvNS7W+yLe2jUBaSiOHBrA 1fPSHobvGzGFq7VcZqQYz9WA3S7C+SX/4fANDKeyuyDCq+kURZrOytmR/oTlk7YdSQF4yX Lve5kWeBksdMakn0abIew3YTKQB/CE2jf0h5dzzMmchj/CR2YEG+gCd2ldtTzQ== 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=1701981810; 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=sAjZtfTIJkQ2gV1rAtKpgsvLqzbKeUcPmb44Ts0UmLo=; b=gxfZkQI42msxsQPKMV2XbEwmvk/DFBwDqTprZ9Yg/Qx39Mcn0OfdymjbkzLI5xQItt05WV Vgc6jaXdWfZbYgAeIOIv60X3oyKWxX+WKGueTP+BphcDzeUeIpnrNQX2VYwgpLRhujpaif 7uZSQdQPKxPVK0eWZCGOJ814w/6l6CpwHQeoFaOHT28FOp/E8ShvXAxovZh/bwjIGkZZCw WPak+nEf4skRADeQY9rV1wzjoEt7GuHkbJFpDbJg4qWSUrGAeEQFZ8QnQO9xRJpX9G4FTr hHaFrO4JiXVfAesGPXN9jartUU263MQl47wAEKIZwe8j8M83h6NQTmpDRK3yTw== 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 4SmR7Q5lyzzsMF; Thu, 7 Dec 2023 20:43:30 +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 3B7KhUN5073428; Thu, 7 Dec 2023 20:43:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7KhUXA073425; Thu, 7 Dec 2023 20:43:30 GMT (envelope-from git) Date: Thu, 7 Dec 2023 20:43:30 GMT Message-Id: <202312072043.3B7KhUXA073425@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: bd234c0d4c82 - main - 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd234c0d4c8256db7e5a1fdda9ef311c9e0080e4 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bd234c0d4c8256db7e5a1fdda9ef311c9e0080e4 commit bd234c0d4c8256db7e5a1fdda9ef311c9e0080e4 Author: Warner Losh AuthorDate: 2023-12-07 20:27:07 +0000 Commit: Warner Losh CommitDate: 2023-12-07 20:42:52 +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 --- 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 } } }