Date: Wed, 25 Jan 2023 16:05:54 +0000 From: Jessica Clarke <jrtc27@freebsd.org> To: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@FreeBSD.org> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: 783c318fd118 - main - zoneinfo: On amd64, include 32-bit data. Message-ID: <FE7BB6AA-052E-4CFB-AD53-33A397324A84@freebsd.org> In-Reply-To: <202301251555.30PFtxeh015569@gitrepo.freebsd.org> References: <202301251555.30PFtxeh015569@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 25 Jan 2023, at 15:55, Dag-Erling Sm=C3=B8rgrav <des@FreeBSD.org> = wrote: >=20 > The branch main has been updated by des: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D783c318fd1181d46554c31a5039db10e= 7f5eef49 >=20 > commit 783c318fd1181d46554c31a5039db10e7f5eef49 > Author: Dag-Erling Sm=C3=B8rgrav <des@FreeBSD.org> > AuthorDate: 2023-01-25 15:54:52 +0000 > Commit: Dag-Erling Sm=C3=B8rgrav <des@FreeBSD.org> > CommitDate: 2023-01-25 15:54:52 +0000 >=20 > zoneinfo: On amd64, include 32-bit data. >=20 > While there, drop the unnecessary posixrules option. I=E2=80=99m not sure how this makes sense. Isn=E2=80=99t the file format = entirely MI? There=E2=80=99s nothing in zic that knows what TARGET_ARCH is when = building the bootstrap tool, the only thing it could possibly look at is MACHINE_ARCH for the bootstrap tool, but that would tell you about the build machine not the target machine. So why does cross-compiling i386 on amd64 work but lib32 from a native amd64 build doesn=E2=80=99t? Jess > 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(-) >=20 > 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=3D > TZFILES=3D africa antarctica asia australasia etcetera europe \ > factory northamerica southamerica > TZFILES+=3D backward > -POSIXRULES=3D America/New_York >=20 > TZFILES:=3D ${TZFILES:S/^/${CONTRIBDIR}/} >=20 > @@ -78,11 +77,17 @@ all: zoneinfo > .endif > META_TARGETS+=3D zoneinfo install-zoneinfo >=20 > +# On amd64, include 32-bit data for compatibility with = statically-linked > +# i386 binaries which still use a 32-bit time_t. > +.if ${MACHINE_ARCH} =3D=3D "amd64" > +ZICFLAGS+=3D -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} >=20 > #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?FE7BB6AA-052E-4CFB-AD53-33A397324A84>