From b7374f15bd2c01e8ca6192648e964a950e5c6833 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 ee1b9bf463..ad68a521c8 100644 --- a/src/pl/plperl/plc_perlboot.pl +++ b/src/pl/plperl/plc_perlboot.pl @@ -3,7 +3,6 @@ use strict; use warnings; -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 457e328824..004b4b2a4a 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;