[PATCH] Stop using zic’s -p option.

Paul Eggert <eggert@cs.ucla.edu>

From: Paul Eggert <eggert@cs.ucla.edu>
To: pgsql-bugs@lists.postgresql.org
Cc: Paul Eggert <eggert@cs.ucla.edu>
Date: 2020-06-21T21:18:55Z
Lists: pgsql-bugs
‘zic -p’ is obsolescent and is incompatible with ‘zic -b slim’.
* src/tools/msvc/Install.pm (GenerateTimezoneFiles):
Omit use of zic’s -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 = split /\s+/, $1;
 
-	$mf =~ /^POSIXRULES\s*:?=\s*(.*)$/m
-	  || die "Could not find POSIXRULES line in timezone makefile\n";
-	my $posixrules = $1;
-	$posixrules =~ s/\s+//g;
-
 	print "Generating timezone files...";
 
 	my @args = (
-		"$conf/zic/zic", '-d', "$target/share/timezone", '-p',
-		"$posixrules",   '-b', 'slim');
+		"$conf/zic/zic", '-d', "$target/share/timezone",
+		'-b', 'slim');
 	foreach (@tzfiles)
 	{
 		my $tzfile = $_;
-- 
2.25.4




Commits

  1. Remove support for timezone "posixrules" file.