Re: [PATCH] random:cipher: handle substitution in sed command

dear all,

the patch below did not make it yet into the libgcrypt source tree. 
Note: cipher/Makefile.am up to now did not have the g flag at the first 
-e.... -- i can not judge if it would be a Good Thing to add it 
(probably it is :-).  but the patch to random/Makefile.am seems neccessary:

g flag at the first -e's....' in random/Makefile.am was dropped in 
b99952a on 7 May 2024.  unfortunately, the missing g flag now breaks 
install of libgcrypt-1.11.0 in "gentoo prefix" instance, as some 
automagic there inserts a double "-O2 -pipe" into the CFLAGS during build.

thank you for consideration.


On 6/11/24 03:52, simit.ghane at lge.com (simit.ghane) wrote:
> It was there earlier and accidentally removed from
> Makefile.am of cipher and random
> 
> Signed-off-by: simit.ghane <simit.ghane at lge.com>
> ---
>   cipher/Makefile.am | 2 +-
>   random/Makefile.am | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/cipher/Makefile.am b/cipher/Makefile.am
> index a914ed2ba4..956ca345e3 100644
> --- a/cipher/Makefile.am
> +++ b/cipher/Makefile.am
> @@ -168,7 +168,7 @@ gost-s-box$(EXEEXT_FOR_BUILD): gost-s-box.c
>   
>   
>   if ENABLE_O_FLAG_MUNGING
> -o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /' -e 's/[[:blank:]]-Ofast/ -O1 /g'
> +o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /g' -e 's/[[:blank:]]-Ofast/ -O1 /g'
>   else
>   o_flag_munging = cat
>   endif
> diff --git a/random/Makefile.am b/random/Makefile.am
> index c7100ef8b8..a42e430649 100644
> --- a/random/Makefile.am
> +++ b/random/Makefile.am
> @@ -56,7 +56,7 @@ jitterentropy-base.c jitterentropy.h jitterentropy-base-user.h
>   
>   # The rndjent module needs to be compiled without optimization.  */
>   if ENABLE_O_FLAG_MUNGING
> -o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /' -e 's/[[:blank:]]-Ofast/ -O0 /g'
> +o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /g' -e 's/[[:blank:]]-Ofast/ -O0 /g'
>   else
>   o_flag_munging = cat
>   endif