Skip to content

Commit

Permalink
lib/build_OID_registry: avoid non-destructive substitution for Perl <…
Browse files Browse the repository at this point in the history
… 5.13.2 compat

On a system with Perl 5.12.1, commit 5ef6dc0
("lib/build_OID_registry: don't mention the full path of the script in
output") causes the build to fail with the error below.

     Bareword found where operator expected at ./lib/build_OID_registry line 41, near "s#^\Q$abs_srctree/\E##r"
     syntax error at ./lib/build_OID_registry line 41, near "s#^\Q$abs_srctree/\E##r"
     Execution of ./lib/build_OID_registry aborted due to compilation errors.
     make[3]: *** [lib/Makefile:352: lib/oid_registry_data.c] Error 255

Ahmad Fatoum analyzed that non-destructive substitution is only supported since
Perl 5.13.2. Instead of dropping `r` and having the side effect of modifying
`$0`, introduce a dedicated variable to support older Perl versions.

Link: https://lkml.kernel.org/r/[email protected]
Link: https://lkml.kernel.org/r/[email protected]
Fixes: 5ef6dc0 ("lib/build_OID_registry: don't mention the full path of the script in output")
Link: https://lore.kernel.org/all/[email protected]/
Signed-off-by: Paul Menzel <[email protected]>
Suggested-by: Ahmad Fatoum <[email protected]>
Cc: Uwe Kleine-König <[email protected]>
Cc: Nicolas Schier <[email protected]>
Cc: Masahiro Yamada <[email protected]>
Cc: Ahmad Fatoum <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
  • Loading branch information
paulmenzel authored and akpm00 committed Jul 6, 2024
1 parent f442fa6 commit 2fe29fe
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion lib/build_OID_registry
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ close IN_FILE || die;
#
open C_FILE, ">$ARGV[1]" or die;
print C_FILE "/*\n";
print C_FILE " * Automatically generated by ", $0 =~ s#^\Q$abs_srctree/\E##r, ". Do not edit\n";
my $scriptname = $0;
$scriptname =~ s#^\Q$abs_srctree/\E##;
print C_FILE " * Automatically generated by ", $scriptname, ". Do not edit\n";
print C_FILE " */\n";

#
Expand Down

0 comments on commit 2fe29fe

Please sign in to comment.