From nobody Fri Dec 15 00:41:41 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 4Srr516X90z5418s; Fri, 15 Dec 2023 00:41:41 +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 4Srr514j4Jz3XJn; Fri, 15 Dec 2023 00:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702600901; 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=+JCsQQFD/VmwqgFDTQu0+tfEMJMF7ikokAaIGZZgXaY=; b=Ovhn/ycwH5EWgXTcGCyTvv0R/k8S8z2c2y76Kmf/CXK4pSZWPT0QSRKWV0r+RVs50lsFk7 sloNzoKy264iHb6bTJDZllOQLt4LnOsBVA5fDGySiMhtiddCXjvHJN+cXcWdGFw7IiEM6v Xm4uIFAQ1uCK1Sf59/C1P/Vm1bcalEJDZhhXfiSYfE/bGIIEU1Ihm+PM+t9uNUVUBLNVIL KeRg5VsRBQZSumG6FAxeiEnrximvRCIBGZKml8Rg295uDekr24zUukNvqXhaHz/TziI18w 256EmSrxDHXXBs4JC6OyLaKYD/ihEoSYDoI9bkBHDunRb45xHhZ8hHty2g0j0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702600901; a=rsa-sha256; cv=none; b=WqwzSAxs1tp9qALVPJm9lOruYYreQOoqC3tisUDMIq4BdDI+y17PDT512he7MRSGsmBUNQ d4YQujxguwadoZ+JfTwrNQJZhwuZ1IbLogcWfhr78s+iUAsJWjc+wVrCi/8DjZvEQLiB7F UwaZkuFISSuQTIO8ifd73i9ENSUFetxbGeoqmhAzU7Fia2rPgx4fhr1ZNilgQtew1A3F21 KErzDYEmeAp3lxQSds/cuUuPD/Xd9qRMqW5y38mht2EALYrh3f+Px+O+HDjo6pzzTRczhU NaiVpssjXXh1i2KL5OPituKzUofPEFN4EXjGKCBZ7uxBL2pI3ustTbhA07B33A== 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=1702600901; 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=+JCsQQFD/VmwqgFDTQu0+tfEMJMF7ikokAaIGZZgXaY=; b=saaH2Qt3dRUSh0t6mtrLLKcosT71FVR7IG8MXcZdgi/vYEyxJ6VjopwYjYeuE6CT68Fcc5 FG3Tz55Sk6dbaO/nI+jzO+I+V/kE1sa1YkbOEjVXrZcbNZYJ0JcA3sIa3835rF/1ETdX4P jubTdqa9rXk7d3UAxhv6jFsgNU53ydgMW1wTFJsunB5Sd69evx3yl1nBGe+hxh9Jp8hRnM br4EAMwlwu4XFGlqS8EsiezpPxS9N8WLa/CrSBKyZx1iyHUmStiFyXwSBplxCnhzE3NCZ4 V/3iEDyj9QCF+hB8WsMQVx5zgrfwuqF4Wp4H41NrRGbr9JT4Hcl4yVzQ2f79TQ== 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 4Srr513LJ9zqJ1; Fri, 15 Dec 2023 00:41:41 +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 3BF0ff6i090022; Fri, 15 Dec 2023 00:41:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BF0ff4I090019; Fri, 15 Dec 2023 00:41:41 GMT (envelope-from git) Date: Fri, 15 Dec 2023 00:41:41 GMT Message-Id: <202312150041.3BF0ff4I090019@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: 4c45ab6ac8c8 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 4c45ab6ac8c875fc227a40e4c5304d604b6c2a96 Auto-Submitted: auto-generated The branch stable/13 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=4c45ab6ac8c875fc227a40e4c5304d604b6c2a96 commit 4c45ab6ac8c875fc227a40e4c5304d604b6c2a96 Author: Warner Losh AuthorDate: 2023-12-07 20:27:07 +0000 Commit: Christos Margiolis CommitDate: 2023-12-15 00:41:05 +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 } } }