* + lib-build_oid_registry-avoid-non-destructive-substitution-for-perl-5132-compat.patch added to mm-hotfixes-unstable branch
@ 2024-07-02 2:37 Andrew Morton
0 siblings, 0 replies; only message in thread
From: Andrew Morton @ 2024-07-02 2:37 UTC (permalink / raw)
To: mm-commits, u.kleine-koenig, nicolas, masahiroy, a.fatoum,
pmenzel, akpm
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 3477 bytes --]
The patch titled
Subject: lib/build_OID_registry: avoid non-destructive substitution for Perl < 5.13.2 compat
has been added to the -mm mm-hotfixes-unstable branch. Its filename is
lib-build_oid_registry-avoid-non-destructive-substitution-for-perl-5132-compat.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/lib-build_oid_registry-avoid-non-destructive-substitution-for-perl-5132-compat.patch
This patch will later appear in the mm-hotfixes-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Paul Menzel <pmenzel@molgen.mpg.de>
Subject: lib/build_OID_registry: avoid non-destructive substitution for Perl < 5.13.2 compat
Date: Mon, 1 Jul 2024 17:58:01 +0200
On a system with Perl 5.12.1, commit 5ef6dc08cfde
("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/20240701155802.75152-1-pmenzel@molgen.mpg.de
Fixes: 5ef6dc08cfde ("lib/build_OID_registry: don't mention the full path of
the script in output")
Link: https://lore.kernel.org/all/259f7a87-2692-480e-9073-1c1c35b52f67@molgen.mpg.de/
Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>
Suggested-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Nicolas Schier <nicolas@fjasle.eu>
Cc: Masahiro Yamada <masahiroy@kernel.org>
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
lib/build_OID_registry | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/lib/build_OID_registry~lib-build_oid_registry-avoid-non-destructive-substitution-for-perl-5132-compat
+++ a/lib/build_OID_registry
@@ -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";
#
_
Patches currently in -mm which might be from pmenzel@molgen.mpg.de are
lib-build_oid_registry-avoid-non-destructive-substitution-for-perl-5132-compat.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-07-02 2:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-02 2:37 + lib-build_oid_registry-avoid-non-destructive-substitution-for-perl-5132-compat.patch added to mm-hotfixes-unstable branch Andrew Morton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.