Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jnAJK-0004ax-4n for pgsql-bugs@arkaria.postgresql.org; Mon, 22 Jun 2020 00:27:42 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1jnAJJ-0006i6-1E for pgsql-bugs@arkaria.postgresql.org; Mon, 22 Jun 2020 00:27:41 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jn7NK-0007zi-ST for pgsql-bugs@lists.postgresql.org; Sun, 21 Jun 2020 21:19:38 +0000 Received: from zimbra.cs.ucla.edu ([131.179.128.68]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jn7NG-0008Or-GP for pgsql-bugs@lists.postgresql.org; Sun, 21 Jun 2020 21:19:37 +0000 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id BF0A61600B5 for ; Sun, 21 Jun 2020 14:19:29 -0700 (PDT) Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id 4XOd7ef-VeFF; Sun, 21 Jun 2020 14:19:29 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 116DF160097; Sun, 21 Jun 2020 14:19:29 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id ntD4JoFSVm-U; Sun, 21 Jun 2020 14:19:28 -0700 (PDT) Received: from Penguin.CS.UCLA.EDU (Penguin.CS.UCLA.EDU [131.179.64.200]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id E3EFB160085; Sun, 21 Jun 2020 14:19:28 -0700 (PDT) From: Paul Eggert To: pgsql-bugs@lists.postgresql.org Cc: Paul Eggert Subject: [PATCH] =?UTF-8?q?Stop=20using=20zic=E2=80=99s=20-p=20option.?= Date: Sun, 21 Jun 2020 14:18:55 -0700 Message-Id: <20200621211855.6211-1-eggert@cs.ucla.edu> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk =E2=80=98zic -p=E2=80=99 is obsolescent and is incompatible with =E2=80=98= zic -b slim=E2=80=99. * src/tools/msvc/Install.pm (GenerateTimezoneFiles): Omit use of zic=E2=80=99s -p option. --- src/tools/msvc/Install.pm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index 9bf111c41e..31659fc299 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm @@ -366,16 +366,11 @@ sub GenerateTimezoneFiles || die "Could not find TZDATAFILES line in timezone makefile\n"; my @tzfiles =3D split /\s+/, $1; =20 - $mf =3D~ /^POSIXRULES\s*:?=3D\s*(.*)$/m - || die "Could not find POSIXRULES line in timezone makefile\n"; - my $posixrules =3D $1; - $posixrules =3D~ s/\s+//g; - print "Generating timezone files..."; =20 my @args =3D ( - "$conf/zic/zic", '-d', "$target/share/timezone", '-p', - "$posixrules", '-b', 'slim'); + "$conf/zic/zic", '-d', "$target/share/timezone", + '-b', 'slim'); foreach (@tzfiles) { my $tzfile =3D $_; --=20 2.25.4