WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

configure.ac: escape backslashes when generating preprocessor directives for .build_params; delete backslashes and process parenthesized arguments correctly when generating options.h.

pull/6351/head
Daniel Pouzzner 2023-04-27 17:38:29 -05:00
parent 7b52913451
commit 3f60fa8c3b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@ -8634,8 +8634,8 @@ fi
if test "$ENABLED_REPRODUCIBLE_BUILD" != "yes" if test "$ENABLED_REPRODUCIBLE_BUILD" != "yes"
then then
echo "#define LIBWOLFSSL_CONFIGURE_ARGS \"$ac_configure_args\"" > "${output_objdir}/.build_params" && echo "#define LIBWOLFSSL_CONFIGURE_ARGS \"$ac_configure_args\"" | sed 's/\\/\\\\/g' > "${output_objdir}/.build_params" &&
echo "#define LIBWOLFSSL_GLOBAL_CFLAGS \"$CPPFLAGS $AM_CPPFLAGS $CFLAGS $AM_CFLAGS\" LIBWOLFSSL_GLOBAL_EXTRA_CFLAGS" >> "${output_objdir}/.build_params" || echo "#define LIBWOLFSSL_GLOBAL_CFLAGS \"$CPPFLAGS $AM_CPPFLAGS $CFLAGS $AM_CFLAGS\" LIBWOLFSSL_GLOBAL_EXTRA_CFLAGS" | sed 's/\\/\\\\/g' >> "${output_objdir}/.build_params" ||
AC_MSG_ERROR([Couldn't create ${output_objdir}/.build_params.]) AC_MSG_ERROR([Couldn't create ${output_objdir}/.build_params.])
else else
rm -f "${output_objdir}/.build_params" rm -f "${output_objdir}/.build_params"
@ -8680,8 +8680,9 @@ for option in $CPPFLAGS $AM_CPPFLAGS $CFLAGS $AM_CFLAGS; do
opt_type=$(echo $option | $TRIM ) opt_type=$(echo $option | $TRIM )
case "$opt_type" in case "$opt_type" in
-D) -D)
RHS_only=$(echo $option | sed 's/^-D//') option=$(echo "$option" | tr -d '\\')
noequalsign=$(echo $RHS_only | sed 's/=/ /') RHS_only=$(echo "$option" | sed 's/^-D//')
noequalsign=$(echo "$RHS_only" | tr '=' ' ')
if test "$noequalsign" = "NDEBUG" || test "$noequalsign" = "DEBUG" if test "$noequalsign" = "NDEBUG" || test "$noequalsign" = "DEBUG"
then then
if test "$verbose" = "yes"; then if test "$verbose" = "yes"; then
@ -8697,7 +8698,9 @@ for option in $CPPFLAGS $AM_CPPFLAGS $CFLAGS $AM_CFLAGS; do
echo "#ifndef WOLFSSL_OPTIONS_IGNORE_SYS" >> $OPTION_FILE echo "#ifndef WOLFSSL_OPTIONS_IGNORE_SYS" >> $OPTION_FILE
fi fi
noarg=$(echo "$RHS_only" | sed 's/=.*//') # note need to use both autotools-style [] quoting and shell-style ''
# quoting for sed script with [] character set expression here.
noarg=$(echo "$RHS_only" | sed ['s/\(([^=)]*)\)\{0,1\}=.*//'])
echo "#undef $noarg" >> $OPTION_FILE echo "#undef $noarg" >> $OPTION_FILE
echo "#define $noequalsign" >> $OPTION_FILE echo "#define $noequalsign" >> $OPTION_FILE