Skip to content

Commit

Permalink
Patch scripts to not require Perl 5.14.
Browse files Browse the repository at this point in the history
  • Loading branch information
dumol committed Apr 5, 2022
1 parent b69b124 commit 6b79a57
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 9 deletions.
52 changes: 52 additions & 0 deletions src/libxcrypt/force_perl_510.patch
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,55 @@ index 5074c031..a99e7ce9 100755
fi
# Extract the first word of "gpg2", so it can be a program name with args.
set dummy gpg2; ac_word=$2
diff --git a/test/TestCommon.pm b/test/TestCommon.pm
index 7051d822..a1f09d81 100644
--- a/test/TestCommon.pm
+++ b/test/TestCommon.pm
@@ -9,7 +9,7 @@

package TestCommon;

-use v5.14; # implicit use strict, use feature ':5.14'
+use v5.10; # implicit use strict, use feature ':5.14'
use warnings FATAL => 'all';
use utf8;
use open qw(:utf8);
diff --git a/test/symbols-compat.pl b/test/symbols-compat.pl
index 1b5441b2..95b33368 100644
--- a/test/symbols-compat.pl
+++ b/test/symbols-compat.pl
@@ -19,7 +19,7 @@
# $CC, $NM - names of tools to run (defaults to 'cc' and 'nm' respectively)
# $CFLAGS, $LDFLAGS - options to pass to $CC when linking (default: empty)

-use v5.14; # implicit use strict, use feature ':5.14'
+use v5.10; # implicit use strict, use feature ':5.14'
use warnings FATAL => 'all';
use utf8;
use open qw(:std :utf8);
diff --git a/test/symbols-renames.pl b/test/symbols-renames.pl
index e261cf22..af1905e6 100644
--- a/test/symbols-renames.pl
+++ b/test/symbols-renames.pl
@@ -17,7 +17,7 @@
# $SYMBOL_PREFIX - prefix, if any, added to global symbols defined from C
# $NM, $CPP, $CPPFLAGS - nm utility, C preprocessor, and parameters

-use v5.14; # implicit use strict, use feature ':5.14'
+use v5.10; # implicit use strict, use feature ':5.14'
use warnings FATAL => 'all';
use utf8;
use open qw(:std :utf8);
diff --git a/test/symbols-static.pl b/test/symbols-static.pl
index aabba5c7..75a72440 100644
--- a/test/symbols-static.pl
+++ b/test/symbols-static.pl
@@ -19,7 +19,7 @@
# $SYMBOL_PREFIX - prefix, if any, added to global symbols defined from C
# $NM, $CPP, $CPPFLAGS - nm utility, C preprocessor, and parameters

-use v5.14; # implicit use strict, use feature ':5.14'
+use v5.10; # implicit use strict, use feature ':5.14'
use warnings FATAL => 'all';
use utf8;
use open qw(:std :utf8);
10 changes: 5 additions & 5 deletions src/libxcrypt/libxcrypt-4.4.28/configure
Original file line number Diff line number Diff line change
Expand Up @@ -4808,16 +4808,16 @@ $as_echo "no" >&6; }
fi


{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PERL is version 5.14.0 or later" >&5
$as_echo_n "checking whether $PERL is version 5.14.0 or later... " >&6; }
$as_echo "$as_me:${as_lineno-$LINENO}: $PERL -e 'use v5.14.0;'" >&5
if "$PERL" -e 'use v5.14.0;' >&5 2>&1; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PERL is version 5.10.0 or later" >&5
$as_echo_n "checking whether $PERL is version 5.10.0 or later... " >&6; }
$as_echo "$as_me:${as_lineno-$LINENO}: $PERL -e 'use v5.10.0;'" >&5
if "$PERL" -e 'use v5.10.0;' >&5 2>&1; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
as_fn_error $? "Perl version 5.14.0 or later is required" "$LINENO" 5
as_fn_error $? "Perl version 5.10.0 or later is required" "$LINENO" 5
fi
# Extract the first word of "gpg2", so it can be a program name with args.
set dummy gpg2; ac_word=$2
Expand Down
2 changes: 1 addition & 1 deletion src/libxcrypt/libxcrypt-4.4.28/test/TestCommon.pm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

package TestCommon;

use v5.14; # implicit use strict, use feature ':5.14'
use v5.10; # implicit use strict, use feature ':5.14'
use warnings FATAL => 'all';
use utf8;
use open qw(:utf8);
Expand Down
2 changes: 1 addition & 1 deletion src/libxcrypt/libxcrypt-4.4.28/test/symbols-compat.pl
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# $CC, $NM - names of tools to run (defaults to 'cc' and 'nm' respectively)
# $CFLAGS, $LDFLAGS - options to pass to $CC when linking (default: empty)

use v5.14; # implicit use strict, use feature ':5.14'
use v5.10; # implicit use strict, use feature ':5.14'
use warnings FATAL => 'all';
use utf8;
use open qw(:std :utf8);
Expand Down
2 changes: 1 addition & 1 deletion src/libxcrypt/libxcrypt-4.4.28/test/symbols-renames.pl
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# $SYMBOL_PREFIX - prefix, if any, added to global symbols defined from C
# $NM, $CPP, $CPPFLAGS - nm utility, C preprocessor, and parameters

use v5.14; # implicit use strict, use feature ':5.14'
use v5.10; # implicit use strict, use feature ':5.14'
use warnings FATAL => 'all';
use utf8;
use open qw(:std :utf8);
Expand Down
2 changes: 1 addition & 1 deletion src/libxcrypt/libxcrypt-4.4.28/test/symbols-static.pl
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# $SYMBOL_PREFIX - prefix, if any, added to global symbols defined from C
# $NM, $CPP, $CPPFLAGS - nm utility, C preprocessor, and parameters

use v5.14; # implicit use strict, use feature ':5.14'
use v5.10; # implicit use strict, use feature ':5.14'
use warnings FATAL => 'all';
use utf8;
use open qw(:std :utf8);
Expand Down

0 comments on commit 6b79a57

Please sign in to comment.