From nobody Wed Jan 25 15:55:59 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 4P27jW41Xjz3bnBD; Wed, 25 Jan 2023 15:55:59 +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 4P27jW3TxGz4Kn5; Wed, 25 Jan 2023 15:55:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674662159; 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=pdUhXaamEW5QJyzwVxjmVXgoKZCcuOmc5RM5bT7QtOk=; b=MXNtGVWS6xP3eVCTdfJd7vIoHxuTnVta2BTAf0ZNPUjU9ci2TNhOZqf4YOLSPeqfPB1g8+ 7Y9A1wZR3+Is7aCe8MtPzpE9CE+Z051Y27a6+CScyvXtCPFFMIyPmvNV0zbXZ+WbumMYm5 vQNS7lkl9pElUDyIiKYLvDyJPBNsLUyfU8GYZOmJ73LrC1qP+MTluSEU4IbYnA3aRZ7T2/ OnOCrAjX9Lv0dtddb4GZLPIJ3boC0HZCzeV+rEoF2T14b9pdZZ3dXvYqAtW6mf0im/qTos ZyEnrKjRKGLJFNQajcLcZhxrQqJ0RmakdJiVBMw/jkArfHpzvgluMNavx3Cf6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674662159; 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=pdUhXaamEW5QJyzwVxjmVXgoKZCcuOmc5RM5bT7QtOk=; b=rj4hXOGwxeruAJP7apHxNd+mz3/AKnMEIXZyxO4un6fJ6sdsUGvYWR6F92B/9I1IEJgp8f PA6XyPazq46SjjpMzEoqRzYedArg9VNppfKxeKtMydQHN1exHT2bVxzl0EZxZq16EH6+oX TkW9nUYENDM2f1HtnNr5IqZYQhhOkrwbLkDtchhUpek8hTjojepr1eG1R49iM+JTb9OQ1p ZESS+G+qJZNFkVZbxrpzz8buCHvUFQvh8x7ipuoCiTH0jm6JPocF3NKQpDBRY/sYDxgIdC at05DUtUgTpLudBGBQqrj1KrzCuz5VirNFKYgPgcSm0m2eCJqJHplgrjlBG7pQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674662159; a=rsa-sha256; cv=none; b=q1sdsBffKI5nMvHfvShgr46+y5zqEe7LhyHLPGJFWePLcEUMJHzCPLDBfpWMRNZ30mN4eb BmVGW5EUf0pT+P67mDJbzYzPkbMofvuMOIW2xiuq75Fwl8dFwqO6d0YF6simJTedUiu5ds iBQKCbsJb+MVkgqoy6PPgV4iIzArQuBMxpmCuD6qPNAZjz+WHGC88XcVN5RC4RsJ8SAE6H 7os+4no+0vsZc3LXDD0cXAHZ667Iipu19B9fXfeiT1dhlF5228rOecIB53Q64s1ObW0LCL Vx24wvwRiSz19i1VUHQ4IQ5wKRIH5dM+tza4CK3B8kkZqRsfGAyUZCiZdDD0Mw== 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 4P27jW2YSYzvjX; Wed, 25 Jan 2023 15:55:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30PFtxD1015570; Wed, 25 Jan 2023 15:55:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30PFtxeh015569; Wed, 25 Jan 2023 15:55:59 GMT (envelope-from git) Date: Wed, 25 Jan 2023 15:55:59 GMT Message-Id: <202301251555.30PFtxeh015569@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 783c318fd118 - main - zoneinfo: On amd64, include 32-bit data. 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 783c318fd1181d46554c31a5039db10e7f5eef49 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=783c318fd1181d46554c31a5039db10e7f5eef49 commit 783c318fd1181d46554c31a5039db10e7f5eef49 Author: Dag-Erling Smørgrav AuthorDate: 2023-01-25 15:54:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-01-25 15:54:52 +0000 zoneinfo: On amd64, include 32-bit data. While there, drop the unnecessary posixrules option. Sponsored by: Klara, Inc. Reviewed by: imp, allanjude Differential Revision: https://reviews.freebsd.org/D38142 --- share/zoneinfo/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index dfe148544bd6..cffd12cc5e9a 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -51,7 +51,6 @@ LEAPFILE= TZFILES= africa antarctica asia australasia etcetera europe \ factory northamerica southamerica TZFILES+= backward -POSIXRULES= America/New_York TZFILES:= ${TZFILES:S/^/${CONTRIBDIR}/} @@ -78,11 +77,17 @@ all: zoneinfo .endif META_TARGETS+= zoneinfo install-zoneinfo +# On amd64, include 32-bit data for compatibility with statically-linked +# i386 binaries which still use a 32-bit time_t. +.if ${MACHINE_ARCH} == "amd64" +ZICFLAGS+= -b fat +.endif + zoneinfo: ${TDATA} mkdir -p ${TZBUILDDIR} cd ${TZBUILDDIR}; mkdir -p ${TZBUILDSUBDIRS} umask 022; cd ${.CURDIR}; \ - zic -D -d ${TZBUILDDIR} -p ${POSIXRULES} -m ${NOBINMODE} \ + zic -D -d ${TZBUILDDIR} ${ZICFLAGS} -m ${NOBINMODE} \ ${LEAPFILE} ${TZFILES} #