Mercurial > octave

changeset 21421:fdb9adcc02f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't substitute SONAME_FLAGS For now, omit substitution of SONAME_FLAGS. If this is added again later, we should ensure that things like $@ are properly substituted. * subst-config-vals.in.sh, subst-cross-config-vals.in.sh, build-env.h, corefcn/toplev.cc: Eliminate SONAME_FLAGS.
author John W. Eaton <jwe@octave.org>
date Wed, 09 Mar 2016 13:17:48 -0500
parents 29e8d4a922b5
children 00ace5300c4b
files build-aux/subst-config-vals.in.sh build-aux/subst-cross-config-vals.in.sh libinterp/build-env.h libinterp/corefcn/toplev.cc
diffstat 4 files changed, 0 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/build-aux/subst-config-vals.in.sh	Wed Mar 09 13:14:35 2016 -0500
+++ b/build-aux/subst-config-vals.in.sh	Wed Mar 09 13:17:48 2016 -0500
@@ -156,7 +156,6 @@
 SHLEXT_VER="@SHLEXT_VER@"
 SH_LD="@SH_LD@"
 SH_LDFLAGS="@SH_LDFLAGS@"
-SONAME_FLAGS="@SONAME_FLAGS@"
 STATIC_LIBS="@STATIC_LIBS@"
 TERM_LIBS="@TERM_LIBS@"
 UMFPACK_CPPFLAGS="@UMFPACK_CPPFLAGS@"
@@ -314,7 +313,6 @@
   -e "s|%OCTAVE_CONF_SHLEXT_VER%|\"${SHLEXT_VER}\"|" \
   -e "s|%OCTAVE_CONF_SH_LD%|\"${SH_LD}\"|" \
   -e "s|%OCTAVE_CONF_SH_LDFLAGS%|\"${SH_LDFLAGS}\"|" \
-  -e "s|%OCTAVE_CONF_SONAME_FLAGS%|\"${SONAME_FLAGS}\"|" \
   -e "s|%OCTAVE_CONF_STATIC_LIBS%|\"${STATIC_LIBS}\"|" \
   -e "s|%OCTAVE_CONF_TERM_LIBS%|\"${TERM_LIBS}\"|" \
   -e "s|%OCTAVE_CONF_UMFPACK_CPPFLAGS%|\"${UMFPACK_CPPFLAGS}\"|" \
--- a/build-aux/subst-cross-config-vals.in.sh	Wed Mar 09 13:14:35 2016 -0500
+++ b/build-aux/subst-cross-config-vals.in.sh	Wed Mar 09 13:17:48 2016 -0500
@@ -160,7 +160,6 @@
 SHLEXT_VER="@SHLEXT_VER@"
 SH_LD="@SH_LD@"
 SH_LDFLAGS="@SH_LDFLAGS@"
-SONAME_FLAGS="@SONAME_FLAGS@"
 STATIC_LIBS="@STATIC_LIBS@"
 TERM_LIBS="@TERM_LIBS@"
 UMFPACK_CPPFLAGS="@UMFPACK_CPPFLAGS@"
@@ -318,7 +317,6 @@
     -e "s|%OCTAVE_CONF_SHLEXT_VER%|\"${SHLEXT_VER}\"|" \
     -e "s|%OCTAVE_CONF_SH_LD%|\"${SH_LD}\"|" \
     -e "s|%OCTAVE_CONF_SH_LDFLAGS%|\"${SH_LDFLAGS}\"|" \
-    -e "s|%OCTAVE_CONF_SONAME_FLAGS%|\"${SONAME_FLAGS}\"|" \
     -e "s|%OCTAVE_CONF_STATIC_LIBS%|\"${STATIC_LIBS}\"|" \
     -e "s|%OCTAVE_CONF_TERM_LIBS%|\"${TERM_LIBS}\"|" \
     -e "s|%OCTAVE_CONF_UMFPACK_CPPFLAGS%|\"${UMFPACK_CPPFLAGS}\"|" \
--- a/libinterp/build-env.h	Wed Mar 09 13:14:35 2016 -0500
+++ b/libinterp/build-env.h	Wed Mar 09 13:17:48 2016 -0500
@@ -156,7 +156,6 @@
     extern const char *SHLEXT_VER;
     extern const char *SH_LD;
     extern const char *SH_LDFLAGS;
-    extern const char *SONAME_FLAGS;
     extern const char *STATIC_LIBS;
     extern const char *TERM_LIBS;
     extern const char *UMFPACK_CPPFLAGS;
--- a/libinterp/corefcn/toplev.cc	Wed Mar 09 13:14:35 2016 -0500
+++ b/libinterp/corefcn/toplev.cc	Wed Mar 09 13:17:48 2016 -0500
@@ -1584,7 +1584,6 @@
       { "SHLEXT_VER", octave::build_env::SHLEXT_VER },
       { "SH_LD", octave::build_env::SH_LD },
       { "SH_LDFLAGS", octave::build_env::SH_LDFLAGS },
-      { "SONAME_FLAGS", octave::build_env::SONAME_FLAGS },
       { "STATIC_LIBS", octave::build_env::STATIC_LIBS },
       { "TERM_LIBS", octave::build_env::TERM_LIBS },
       { "UMFPACK_CPPFLAGS", octave::build_env::UMFPACK_CPPFLAGS },