From 320534f8f25bf5aa2de4ad1f561b71219cb4e5ff Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Wed, 26 Jun 2024 07:01:47 -0400 Subject: [PATCH] Remove redundant perl version checks Commit 4c1532763a removed some redundant uses of 'use 5.008001;' in perl scripts, including in plperl's plc_perlboot.pl. Because it made other changes it wasn't backpatched. However, now this is causing a failure on back branches when built with bleeding edge perl. Therefore, backpatch just that part of it which removed those uses, from 15 all the way down to 9.2, which is the earliest version currently built in the buildfarm. per report from Alexander Lakhin Discussion: https://postgr.es/m/4cc2ee93-e03c-8e13-61ed-412e7e6ff19d@gmail.com --- src/pl/plperl/plc_perlboot.pl | 1 - src/tools/pgindent/pgindent | 1 - 2 files changed, 2 deletions(-) diff --git a/src/pl/plperl/plc_perlboot.pl b/src/pl/plperl/plc_perlboot.pl index ff05964869..0beca53c17 100644 --- a/src/pl/plperl/plc_perlboot.pl +++ b/src/pl/plperl/plc_perlboot.pl @@ -2,7 +2,6 @@ use strict; -use 5.008001; use vars qw(%_SHARED $_TD); PostgreSQL::InServer::Util::bootstrap(); diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent index a32aaa64f3..b482db4455 100755 --- a/src/tools/pgindent/pgindent +++ b/src/tools/pgindent/pgindent @@ -2,7 +2,6 @@ use strict; use warnings; -use 5.008001; use Cwd qw(abs_path getcwd); use File::Find;