Mercurial > octave
changeset 26229:3af4f3e2dae8
remove unsafe "SED" from the build env stored in liboctinterp and mkoctfile
* build-env.h, build-env.in.cc (octave::build_env::SED): Remove variable.
* toplev.cc (F__octave_config_info__): Remove "SED" from build_environment.
* mkoctfile.in.cc: Remove "SED" from vars and help_msg.
* mkoctfile.1, mkoctfile.m: Remove "SED" from documentation.
* subst-config-vals.in.sh, subst-cross-config-vals.in.sh (OCTAVE_CONF_SED):
Remove from the list of substitution variables populated from the build env.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Thu, 13 Dec 2018 16:01:37 -0800 |
| parents | 4f044bc43f07 |
| children | b2f806601d30 |
| files | build-aux/subst-config-vals.in.sh build-aux/subst-cross-config-vals.in.sh doc/interpreter/mkoctfile.1 libinterp/build-env.h libinterp/build-env.in.cc libinterp/corefcn/toplev.cc scripts/miscellaneous/mkoctfile.m src/mkoctfile.in.cc |
| diffstat | 8 files changed, 7 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/build-aux/subst-config-vals.in.sh Thu Dec 13 14:53:47 2018 -0800 +++ b/build-aux/subst-config-vals.in.sh Thu Dec 13 16:01:37 2018 -0800 @@ -204,7 +204,6 @@ RANLIB="@RANLIB@" RDYNAMIC_FLAG="@RDYNAMIC_FLAG@" READLINE_LIBS="@READLINE_LIBS@" -SED="@SED@" SHARED_LIBS="@SHARED_LIBS@" SH_LD="@SH_LD@" SH_LDFLAGS="@SH_LDFLAGS@" @@ -378,7 +377,6 @@ -e "s|%OCTAVE_CONF_RDYNAMIC_FLAG%|\"${RDYNAMIC_FLAG}\"|" \ -e "s|%OCTAVE_CONF_READLINE_LIBS%|\"${READLINE_LIBS}\"|" | \ $SED \ - -e "s|%OCTAVE_CONF_SED%|\"${SED}\"|" \ -e "s|%OCTAVE_CONF_SHARED_LIBS%|\"${SHARED_LIBS}\"|" \ -e "s|%OCTAVE_CONF_SH_LD%|\"${SH_LD}\"|" \ -e "s|%OCTAVE_CONF_SH_LDFLAGS%|\"${SH_LDFLAGS}\"|" \
--- a/build-aux/subst-cross-config-vals.in.sh Thu Dec 13 14:53:47 2018 -0800 +++ b/build-aux/subst-cross-config-vals.in.sh Thu Dec 13 16:01:37 2018 -0800 @@ -208,7 +208,6 @@ RANLIB="@RANLIB@" RDYNAMIC_FLAG="@RDYNAMIC_FLAG@" READLINE_LIBS="@READLINE_LIBS@" -SED="@SED@" SHARED_LIBS="@SHARED_LIBS@" SH_LD="@SH_LD@" SH_LDFLAGS="@SH_LDFLAGS@" @@ -382,7 +381,6 @@ -e "s|%OCTAVE_CONF_RDYNAMIC_FLAG%|\"${RDYNAMIC_FLAG}\"|" \ -e "s|%OCTAVE_CONF_READLINE_LIBS%|\"${READLINE_LIBS}\"|" | \ $SED \ - -e "s|%OCTAVE_CONF_SED%|\"${SED}\"|" \ -e "s|%OCTAVE_CONF_SHARED_LIBS%|\"${SHARED_LIBS}\"|" \ -e "s|%OCTAVE_CONF_SH_LD%|\"${SH_LD}\"|" \ -e "s|%OCTAVE_CONF_SH_LDFLAGS%|\"${SH_LDFLAGS}\"|" \
--- a/doc/interpreter/mkoctfile.1 Thu Dec 13 14:53:47 2018 -0800 +++ b/doc/interpreter/mkoctfile.1 Thu Dec 13 16:01:37 2018 -0800 @@ -114,9 +114,9 @@ DL_LDFLAGS RANLIB EXEEXT RDYNAMIC_FLAG F77 READLINE_LIBS - F77_INTEGER_8_FLAG SED - FFLAGS XTRA_CFLAGS - FFTW3_LDFLAGS XTRA_CXXFLAGS + F77_INTEGER_8_FLAG XTRA_CFLAGS + FFLAGS XTRA_CXXFLAGS + FFTW3_LDFLAGS FFTW3_LIBS .Ve .RE
--- a/libinterp/build-env.h Thu Dec 13 14:53:47 2018 -0800 +++ b/libinterp/build-env.h Thu Dec 13 16:01:37 2018 -0800 @@ -154,7 +154,6 @@ extern const char *RANLIB; extern const char *RDYNAMIC_FLAG; extern const char *READLINE_LIBS; - extern const char *SED; extern const char *SHARED_LIBS; extern const char *SH_LD; extern const char *SH_LDFLAGS;
--- a/libinterp/build-env.in.cc Thu Dec 13 14:53:47 2018 -0800 +++ b/libinterp/build-env.in.cc Thu Dec 13 16:01:37 2018 -0800 @@ -273,8 +273,6 @@ const char *READLINE_LIBS = %OCTAVE_CONF_READLINE_LIBS%; - const char *SED = %OCTAVE_CONF_SED%; - const char *SHARED_LIBS = %OCTAVE_CONF_SHARED_LIBS%; const char *SH_LD = %OCTAVE_CONF_SH_LD%;
--- a/libinterp/corefcn/toplev.cc Thu Dec 13 14:53:47 2018 -0800 +++ b/libinterp/corefcn/toplev.cc Thu Dec 13 16:01:37 2018 -0800 @@ -551,7 +551,6 @@ { "RANLIB", octave::build_env::RANLIB }, { "RDYNAMIC_FLAG", octave::build_env::RDYNAMIC_FLAG }, { "READLINE_LIBS", octave::build_env::READLINE_LIBS }, - { "SED", octave::build_env::SED }, { "SHARED_LIBS", octave::build_env::SHARED_LIBS }, { "SH_LD", octave::build_env::SH_LD }, { "SH_LDFLAGS", octave::build_env::SH_LDFLAGS },
--- a/scripts/miscellaneous/mkoctfile.m Thu Dec 13 14:53:47 2018 -0800 +++ b/scripts/miscellaneous/mkoctfile.m Thu Dec 13 16:01:37 2018 -0800 @@ -100,10 +100,10 @@ ## FFTW3F_LDFLAGS RANLIB ## FFTW3F_LIBS RDYNAMIC_FLAG ## FFTW3_LDFLAGS READLINE_LIBS -## FFTW3_LIBS SED -## FFTW_LIBS SPECIAL_MATH_LIB -## FLIBS XTRA_CFLAGS -## FPICFLAG XTRA_CXXFLAGS +## FFTW3_LIBS SPECIAL_MATH_LIB +## FFTW_LIBS XTRA_CFLAGS +## FLIBS XTRA_CXXFLAGS +## FPICFLAG ## @end example ## ## @item --link-stand-alone
--- a/src/mkoctfile.in.cc Thu Dec 13 14:53:47 2018 -0800 +++ b/src/mkoctfile.in.cc Thu Dec 13 16:01:37 2018 -0800 @@ -185,8 +185,6 @@ vars["OCTFONTSDIR"] = prepend_octave_home (%OCTAVE_OCTFONTSDIR%); vars["STARTUPFILEDIR"] = prepend_octave_home (%OCTAVE_STARTUPFILEDIR%); - vars["SED"] = get_variable ("SED", %OCTAVE_CONF_SED%); - vars["OCTINCLUDEDIR"] = get_variable ("OCTINCLUDEDIR", prepend_octave_home (%OCTAVE_CONF_OCTINCLUDEDIR%)); @@ -425,7 +423,6 @@ " LIBS\n" " RANLIB\n" " READLINE_LIBS\n" -" SED\n" "\n" " Octave configuration variables that are provided\n" " for informational purposes only. Except for\n"