git: d649e347dfa7 - releng/14.0 - Makefile.asm: Simplify variable expansions in generated headers

From: Ed Maste <emaste_at_FreeBSD.org>
Date: Wed, 25 Oct 2023 20:06:24 UTC
The branch releng/14.0 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=d649e347dfa7a238e1e0db0e9ef4bd4f96df2497

commit d649e347dfa7a238e1e0db0e9ef4bd4f96df2497
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2023-08-29 21:38:27 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-10-25 19:55:00 +0000

    Makefile.asm: Simplify variable expansions in generated headers
    
    The :R:S expressions removed the .pl extension only to add it back
    again, so just trim them to using :T alone.
    
    Reviewed by:    Pierre Pronchery <pierre@freebsdfoundation.org>, markj, emaste
    Differential Revision:  https://reviews.freebsd.org/D41588
    
    (cherry picked from commit 7406b6f9761c35eb53f91f54d1a687d96d638907)
    (cherry picked from commit a3f973f2ea0909be26666d3dcac3c4c45562a678)
    
    Approved by:    re (gjb)
---
 secure/lib/libcrypto/Makefile.asm | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/secure/lib/libcrypto/Makefile.asm b/secure/lib/libcrypto/Makefile.asm
index 1199dc830a50..0ee8c17369e9 100644
--- a/secure/lib/libcrypto/Makefile.asm
+++ b/secure/lib/libcrypto/Makefile.asm
@@ -51,12 +51,12 @@ CLEANFILES=	${ASM} ${SRCS:R:S/$/.s/} sha256-armv8.s
 
 sha256-armv8.S:	sha512-armv8.pl
 	env CC=cc perl ${.ALLSRC} linux64 ${.TARGET:R:S/$/.s/}
-	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\
+	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\
 	cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
 
 .pl.S:
 	env CC=cc perl ${.IMPSRC} linux64 ${.TARGET:R:S/$/.s/}
-	( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T:R:S/$/.pl/}. */' ;\
+	( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\
 	cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
 
 .elif defined(ASM_amd64)
@@ -192,7 +192,7 @@ aes-armv4.S:	aes-armv4.pl
 
 .pl.S:
 	env CC=cc perl ${.IMPSRC} linux32 ${.TARGET:R:S/$/.s/}
-	( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T:R:S/$/.pl/}. */' ;\
+	( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\
 	cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
 
 .elif defined(ASM_i386)
@@ -331,22 +331,22 @@ CLEANFILES=	${ASM}
 
 bn-ppc.S:	ppc.pl
 	env CC=cc perl ${.ALLSRC} linux32 ${.TARGET:R:S/$/.s/}
-	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\
+	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\
 	cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
 
 sha256-ppc.S:	sha512-ppc.pl
 	env CC=cc perl ${.ALLSRC} linux32 ${.TARGET:R:S/$/.s/}
-	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\
+	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\
 	cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
 
 sha256p8-ppc.S:	sha512p8-ppc.pl
 	env CC=cc perl ${.ALLSRC} linux32 ${.TARGET:R:S/$/.s/}
-	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\
+	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\
 	cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
 
 .pl.S:
 	env CC=cc perl ${.IMPSRC} linux32 ${.TARGET:R:S/$/.s/}
-	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\
+	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\
 	cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
 
 .elif defined(ASM_powerpc64)
@@ -398,22 +398,22 @@ CLEANFILES=	${ASM}
 
 bn-ppc.S:	ppc.pl
 	env CC=cc perl ${.ALLSRC} linux64v2 ${.TARGET:R:S/$/.s/}
-	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\
+	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\
 	cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
 
 sha256-ppc.S:	sha512-ppc.pl
 	env CC=cc perl ${.ALLSRC} linux64v2 ${.TARGET:R:S/$/.s/}
-	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\
+	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\
 	cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
 
 sha256p8-ppc.S:	sha512p8-ppc.pl
 	env CC=cc perl ${.ALLSRC} linux64v2 ${.TARGET:R:S/$/.s/}
-	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\
+	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\
 	cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
 
 .pl.S:
 	env CC=cc perl ${.IMPSRC} linux64v2 ${.TARGET:R:S/$/.s/}
-	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\
+	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\
 	cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
 
 .elif defined(ASM_powerpc64le)
@@ -465,22 +465,22 @@ CLEANFILES=	${ASM}
 
 bn-ppc.S:	ppc.pl
 	env CC=cc perl ${.ALLSRC} linux64le ${.TARGET:R:S/$/.s/}
-	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\
+	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\
 	cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
 
 sha256-ppc.S:	sha512-ppc.pl
 	env CC=cc perl ${.ALLSRC} linux64le ${.TARGET:R:S/$/.s/}
-	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\
+	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\
 	cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
 
 sha256p8-ppc.S:	sha512p8-ppc.pl
 	env CC=cc perl ${.ALLSRC} linux64le ${.TARGET:R:S/$/.s/}
-	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\
+	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\
 	cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
 
 .pl.S:
 	env CC=cc perl ${.IMPSRC} linux64le ${.TARGET:R:S/$/.s/}
-	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\
+	( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\
 	cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
 
 .endif