Mercurial > octave

changeset 26603:8af641520aa9 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove references to obsolete build system variables * subst-config-vals.in.sh, subst-cross-config-vals.in.sh: Remove DL_LIBS, OSMESA_CPPFLAGS, OSMESA_LDFLAGS, and OSMESA_LIBS from the list of substitutions. * build-env.h, build-env.in.cc (octave::build_env): Remove DL_LIBS, OSMESA_CPPFLAGS, OSMESA_LDFLAGS, and OSMESA_LIBS variables. * toplev.cc (F__octave_config_info__): Remove DL_LIBS, OSMESA_CPPFLAGS, OSMESA_LDFLAGS, and OSMESA_LIBS from build_environment.
author Mike Miller <mtmiller@octave.org>
date Tue, 22 Jan 2019 15:41:07 -0800
parents 4e521d091a70
children 5224600b1b20 a7502ba98540
files build-aux/subst-config-vals.in.sh build-aux/subst-cross-config-vals.in.sh libinterp/build-env.h libinterp/build-env.in.cc libinterp/corefcn/toplev.cc
diffstat 5 files changed, 0 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/build-aux/subst-config-vals.in.sh	Tue Jan 22 15:39:17 2019 -0800
+++ b/build-aux/subst-config-vals.in.sh	Tue Jan 22 15:41:07 2019 -0800
@@ -118,7 +118,6 @@
 DEPEND_EXTRA_SED_PATTERN="@DEPEND_EXTRA_SED_PATTERN@"
 DL_LD="@DL_LD@"
 DL_LDFLAGS="@DL_LDFLAGS@"
-DL_LIBS="@DL_LIBS@"
 EXEEXT="@EXEEXT@"
 GCC_VERSION="@GCC_VERSION@"
 GXX_VERSION="@GXX_VERSION@"
@@ -183,9 +182,6 @@
 OCT_LINK_DEPS="@OCT_LINK_DEPS@"
 OCT_LINK_OPTS="@OCT_LINK_OPTS@"
 OPENGL_LIBS="@OPENGL_LIBS@"
-OSMESA_CPPFLAGS="@OSMESA_CPPFLAGS@"
-OSMESA_LDFLAGS="@OSMESA_LDFLAGS@"
-OSMESA_LIBS="@OSMESA_LIBS@"
 PCRE_CPPFLAGS="@PCRE_CPPFLAGS@"
 PCRE_LDFLAGS="@PCRE_LDFLAGS@"
 PCRE_LIBS="@PCRE_LIBS@"
@@ -283,7 +279,6 @@
   -e "s|%OCTAVE_CONF_DEPEND_FLAGS%|\"${DEPEND_FLAGS}\"|" \
   -e "s|%OCTAVE_CONF_DL_LD%|\"${DL_LD}\"|" \
   -e "s|%OCTAVE_CONF_DL_LDFLAGS%|\"${DL_LDFLAGS}\"|" \
-  -e "s|%OCTAVE_CONF_DL_LIBS%|\"${DL_LIBS}\"|" \
   -e "s|%OCTAVE_CONF_EXEC_PREFIX%|\"${exec_prefix}\"|" \
   -e "s|%OCTAVE_CONF_EXEEXT%|\"${EXEEXT}\"|" \
   -e "s|%OCTAVE_CONF_F77%|\"${F77}\"|" \
@@ -354,9 +349,6 @@
   -e "s|%OCTAVE_CONF_OCT_LINK_DEPS%|\"${OCT_LINK_DEPS}\"|" \
   -e "s|%OCTAVE_CONF_OCT_LINK_OPTS%|\"${OCT_LINK_OPTS}\"|" \
   -e "s|%OCTAVE_CONF_OPENGL_LIBS%|\"${OPENGL_LIBS}\"|" \
-  -e "s|%OCTAVE_CONF_OSMESA_CPPFLAGS%|\"${OSMESA_CPPFLAGS}\"|" \
-  -e "s|%OCTAVE_CONF_OSMESA_LDFLAGS%|\"${OSMESA_LDFLAGS}\"|" \
-  -e "s|%OCTAVE_CONF_OSMESA_LIBS%|\"${OSMESA_LIBS}\"|" \
   -e "s|%OCTAVE_CONF_PCRE_CPPFLAGS%|\"${PCRE_CPPFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_PCRE_LDFLAGS%|\"${PCRE_LDFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_PCRE_LIBS%|\"${PCRE_LIBS}\"|" \
--- a/build-aux/subst-cross-config-vals.in.sh	Tue Jan 22 15:39:17 2019 -0800
+++ b/build-aux/subst-cross-config-vals.in.sh	Tue Jan 22 15:41:07 2019 -0800
@@ -130,7 +130,6 @@
 DEPEND_EXTRA_SED_PATTERN="@DEPEND_EXTRA_SED_PATTERN@"
 DL_LD="@DL_LD@"
 DL_LDFLAGS="@DL_LDFLAGS@"
-DL_LIBS="@DL_LIBS@"
 EXEEXT="@EXEEXT@"
 GCC_VERSION="@GCC_VERSION@"
 GXX_VERSION="@GXX_VERSION@"
@@ -187,9 +186,6 @@
 OCT_LINK_DEPS="@OCT_LINK_DEPS@"
 OCT_LINK_OPTS="@OCT_LINK_OPTS@"
 OPENGL_LIBS="@OPENGL_LIBS@"
-OSMESA_CPPFLAGS="@OSMESA_CPPFLAGS@"
-OSMESA_LDFLAGS="@OSMESA_LDFLAGS@"
-OSMESA_LIBS="@OSMESA_LIBS@"
 PCRE_CPPFLAGS="@PCRE_CPPFLAGS@"
 PCRE_LDFLAGS="@PCRE_LDFLAGS@"
 PCRE_LIBS="@PCRE_LIBS@"
@@ -287,7 +283,6 @@
   -e "s|%OCTAVE_CONF_DEPEND_FLAGS%|\"${DEPEND_FLAGS}\"|" \
   -e "s|%OCTAVE_CONF_DL_LD%|\"${DL_LD}\"|" \
   -e "s|%OCTAVE_CONF_DL_LDFLAGS%|\"${DL_LDFLAGS}\"|" \
-  -e "s|%OCTAVE_CONF_DL_LIBS%|\"${DL_LIBS}\"|" \
   -e "s|%OCTAVE_CONF_EXEC_PREFIX%|\"${exec_prefix}\"|" \
   -e "s|%OCTAVE_CONF_EXEEXT%|\"${EXEEXT}\"|" \
   -e "s|%OCTAVE_CONF_F77%|\"${F77}\"|" \
@@ -358,9 +353,6 @@
   -e "s|%OCTAVE_CONF_OCT_LINK_DEPS%|\"${OCT_LINK_DEPS}\"|" \
   -e "s|%OCTAVE_CONF_OCT_LINK_OPTS%|\"${OCT_LINK_OPTS}\"|" \
   -e "s|%OCTAVE_CONF_OPENGL_LIBS%|\"${OPENGL_LIBS}\"|" \
-  -e "s|%OCTAVE_CONF_OSMESA_CPPFLAGS%|\"${OSMESA_CPPFLAGS}\"|" \
-  -e "s|%OCTAVE_CONF_OSMESA_LDFLAGS%|\"${OSMESA_LDFLAGS}\"|" \
-  -e "s|%OCTAVE_CONF_OSMESA_LIBS%|\"${OSMESA_LIBS}\"|" \
   -e "s|%OCTAVE_CONF_PCRE_CPPFLAGS%|\"${PCRE_CPPFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_PCRE_LDFLAGS%|\"${PCRE_LDFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_PCRE_LIBS%|\"${PCRE_LIBS}\"|" \
--- a/libinterp/build-env.h	Tue Jan 22 15:39:17 2019 -0800
+++ b/libinterp/build-env.h	Tue Jan 22 15:41:07 2019 -0800
@@ -73,7 +73,6 @@
     extern const char *DEFS;
     extern const char *DL_LD;
     extern const char *DL_LDFLAGS;
-    extern const char *DL_LIBS;
     extern const char *EXEEXT;
     extern const char *GCC_VERSION;
     extern const char *GXX_VERSION;
@@ -132,9 +131,6 @@
     extern const char *OCT_LINK_DEPS;
     extern const char *OCT_LINK_OPTS;
     extern const char *OPENGL_LIBS;
-    extern const char *OSMESA_CPPFLAGS;
-    extern const char *OSMESA_LDFLAGS;
-    extern const char *OSMESA_LIBS;
     extern const char *PCRE_CPPFLAGS;
     extern const char *PCRE_LDFLAGS;
     extern const char *PCRE_LIBS;
--- a/libinterp/build-env.in.cc	Tue Jan 22 15:39:17 2019 -0800
+++ b/libinterp/build-env.in.cc	Tue Jan 22 15:41:07 2019 -0800
@@ -111,8 +111,6 @@
 
     const char *DL_LDFLAGS = %OCTAVE_CONF_DL_LDFLAGS%;
 
-    const char *DL_LIBS = %OCTAVE_CONF_DL_LIBS%;
-
     const char *EXEEXT = %OCTAVE_CONF_EXEEXT%;
 
     const char *GCC_VERSION = %OCTAVE_CONF_GCC_VERSION%;
@@ -229,12 +227,6 @@
 
     const char *OPENGL_LIBS = %OCTAVE_CONF_OPENGL_LIBS%;
 
-    const char *OSMESA_CPPFLAGS = %OCTAVE_CONF_OSMESA_CPPFLAGS%;
-
-    const char *OSMESA_LDFLAGS = %OCTAVE_CONF_OSMESA_LDFLAGS%;
-
-    const char *OSMESA_LIBS = %OCTAVE_CONF_OSMESA_LIBS%;
-
     const char *PCRE_CPPFLAGS = %OCTAVE_CONF_PCRE_CPPFLAGS%;
 
     const char *PCRE_LDFLAGS = %OCTAVE_CONF_PCRE_LDFLAGS%;
--- a/libinterp/corefcn/toplev.cc	Tue Jan 22 15:39:17 2019 -0800
+++ b/libinterp/corefcn/toplev.cc	Tue Jan 22 15:41:07 2019 -0800
@@ -477,7 +477,6 @@
            { "DEFS", octave::build_env::DEFS },
            { "DL_LD", octave::build_env::DL_LD },
            { "DL_LDFLAGS", octave::build_env::DL_LDFLAGS },
-           { "DL_LIBS", octave::build_env::DL_LIBS },
            { "GCC_VERSION", octave::build_env::GCC_VERSION },
            { "GXX_VERSION", octave::build_env::GXX_VERSION },
            { "EXEEXT", octave::build_env::EXEEXT },
@@ -530,9 +529,6 @@
            { "OCT_LINK_DEPS", octave::build_env::OCT_LINK_DEPS },
            { "OCT_LINK_OPTS", octave::build_env::OCT_LINK_OPTS },
            { "OPENGL_LIBS", octave::build_env::OPENGL_LIBS },
-           { "OSMESA_CPPFLAGS", octave::build_env::OSMESA_CPPFLAGS },
-           { "OSMESA_LDFLAGS", octave::build_env::OSMESA_LDFLAGS },
-           { "OSMESA_LIBS", octave::build_env::OSMESA_LIBS },
            { "PCRE_CPPFLAGS", octave::build_env::PCRE_CPPFLAGS },
            { "PCRE_LDFLAGS", octave::build_env::PCRE_LDFLAGS },
            { "PCRE_LIBS", octave::build_env::PCRE_LIBS },