Mercurial > octave

changeset 21907:98f5dd2ff29a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Drop old unused build-system library naming variables LIBPRE, LIBEXT, etc * configure.ac: Drop obsolete build-system variables LIBEXT, LIBPRE, SHLBIN, SHLBINPRE, SHLBIN_VER, SHLEXT, SHLEXT_VER, SHLLIB, SHLLIBPRE, SHLLIB_VER, SHLPRE, and SONAME_FLAGS. * build-aux/subst-config-vals.in.sh, build-aux/subst-cross-config-vals.in.sh, build-aux/subst-default-vals.in.sh: Drop LIBEXT, SHLEXT, and SHLEXT_VER substitution variables. * libinterp/build-env.{cc,h} (octave::build_env): Delete LIBEXT, SHLEXT, and SHLEXT_VER global variables. * libinterp/corefcn/toplev.cc (F__octave_config_info__): Likewise. * src/octave-config.in.cc (help_msg, initialize): Delete SHLEXT variable.
author Mike Miller <mtmiller@octave.org>
date Wed, 15 Jun 2016 10:21:48 -0700
parents e0952881e051
children 74d60f5e37be
files build-aux/subst-config-vals.in.sh build-aux/subst-cross-config-vals.in.sh build-aux/subst-default-vals.in.sh configure.ac libinterp/build-env.h libinterp/build-env.in.cc libinterp/corefcn/toplev.cc src/octave-config.in.cc
diffstat 8 files changed, 5 insertions(+), 101 deletions(-) [+]
line wrap: on
line diff
--- a/build-aux/subst-config-vals.in.sh	Wed Jun 15 09:02:17 2016 -0700
+++ b/build-aux/subst-config-vals.in.sh	Wed Jun 15 10:21:48 2016 -0700
@@ -103,7 +103,6 @@
 LEXLIB="@LEXLIB@"
 LFLAGS="@LFLAGS@"
 libdir="@libdir@"
-LIBEXT="@LIBEXT@"
 LIBOCTAVE="@LIBOCTAVE@"
 LIBOCTINTERP="@LIBOCTINTERP@"
 LIBS="@LIBS@"
@@ -151,8 +150,6 @@
 READLINE_LIBS="@READLINE_LIBS@"
 SED="@SED@"
 SHARED_LIBS="@SHARED_LIBS@"
-SHLEXT="@SHLEXT@"
-SHLEXT_VER="@SHLEXT_VER@"
 SH_LD="@SH_LD@"
 SH_LDFLAGS="@SH_LDFLAGS@"
 STATIC_LIBS="@STATIC_LIBS@"
@@ -259,7 +256,6 @@
   -e "s|%OCTAVE_CONF_LEXLIB%|\"${LEXLIB}\"|" \
   -e "s|%OCTAVE_CONF_LFLAGS%|\"${LFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_LIBDIR%|\"${libdir}\"|" \
-  -e "s|%OCTAVE_CONF_LIBEXT%|\"${LIBEXT}\"|" \
   -e "s|%OCTAVE_CONF_LIBOCTAVE%|\"${LIBOCTAVE}\"|" \
   -e "s|%OCTAVE_CONF_LIBOCTINTERP%|\"${LIBOCTINTERP}\"|" \
   -e "s|%OCTAVE_CONF_LIBS%|\"${LIBS}\"|" \
@@ -307,8 +303,6 @@
   -e "s|%OCTAVE_CONF_READLINE_LIBS%|\"${READLINE_LIBS}\"|" \
   -e "s|%OCTAVE_CONF_SED%|\"${SED}\"|" \
   -e "s|%OCTAVE_CONF_SHARED_LIBS%|\"${SHARED_LIBS}\"|" \
-  -e "s|%OCTAVE_CONF_SHLEXT%|\"${SHLEXT}\"|" \
-  -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_STATIC_LIBS%|\"${STATIC_LIBS}\"|" \
--- a/build-aux/subst-cross-config-vals.in.sh	Wed Jun 15 09:02:17 2016 -0700
+++ b/build-aux/subst-cross-config-vals.in.sh	Wed Jun 15 10:21:48 2016 -0700
@@ -115,7 +115,6 @@
 LEXLIB="@LEXLIB@"
 LFLAGS="@LFLAGS@"
 libdir="@libdir@"
-LIBEXT="@LIBEXT@"
 LIBOCTAVE="@LIBOCTAVE@"
 LIBOCTINTERP="@LIBOCTINTERP@"
 LIBS="@LIBS@"
@@ -155,8 +154,6 @@
 READLINE_LIBS="@READLINE_LIBS@"
 SED="@SED@"
 SHARED_LIBS="@SHARED_LIBS@"
-SHLEXT="@SHLEXT@"
-SHLEXT_VER="@SHLEXT_VER@"
 SH_LD="@SH_LD@"
 SH_LDFLAGS="@SH_LDFLAGS@"
 STATIC_LIBS="@STATIC_LIBS@"
@@ -263,7 +260,6 @@
     -e "s|%OCTAVE_CONF_LEXLIB%|\"${LEXLIB}\"|" \
     -e "s|%OCTAVE_CONF_LFLAGS%|\"${LFLAGS}\"|" \
     -e "s|%OCTAVE_CONF_LIBDIR%|\"${libdir}\"|" \
-    -e "s|%OCTAVE_CONF_LIBEXT%|\"${LIBEXT}\"|" \
     -e "s|%OCTAVE_CONF_LIBOCTAVE%|\"${LIBOCTAVE}\"|" \
     -e "s|%OCTAVE_CONF_LIBOCTINTERP%|\"${LIBOCTINTERP}\"|" \
     -e "s|%OCTAVE_CONF_LIBS%|\"${LIBS}\"|" \
@@ -311,8 +307,6 @@
     -e "s|%OCTAVE_CONF_READLINE_LIBS%|\"${READLINE_LIBS}\"|" \
     -e "s|%OCTAVE_CONF_SED%|\"${SED}\"|" \
     -e "s|%OCTAVE_CONF_SHARED_LIBS%|\"${SHARED_LIBS}\"|" \
-    -e "s|%OCTAVE_CONF_SHLEXT%|\"${SHLEXT}\"|" \
-    -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_STATIC_LIBS%|\"${STATIC_LIBS}\"|" \
--- a/build-aux/subst-default-vals.in.sh	Wed Jun 15 09:02:17 2016 -0700
+++ b/build-aux/subst-default-vals.in.sh	Wed Jun 15 10:21:48 2016 -0700
@@ -60,7 +60,6 @@
 startupfiledir="@startupfiledir@"
 api_version="@OCTAVE_API_VERSION@"
 OCTAVE_RELEASE=""
-SHLEXT="@SHLEXT@"
 texi_macros_file="@texi_macros_file@"
 version="@PACKAGE_VERSION@"
 
@@ -106,6 +105,5 @@
   -e "s|%OCTAVE_PREFIX%|\"${prefix}\"|" \
   -e "s|%OCTAVE_API_VERSION%|\"${api_version}\"|" \
   -e "s|%OCTAVE_RELEASE%|\"${OCTAVE_RELEASE}\"|" \
-  -e "s|%OCTAVE_SHLEXT%|\"${SHLEXT}\"|" \
   -e "s|%OCTAVE_TEXI_MACROS_FILE%|\"${texi_macros_file}\"|" \
   -e "s|%OCTAVE_VERSION%|\"${version}\"|"
--- a/configure.ac	Wed Jun 15 09:02:17 2016 -0700
+++ b/configure.ac	Wed Jun 15 10:21:48 2016 -0700
@@ -2005,22 +2005,11 @@
 CPICFLAG=-fPIC
 CXXPICFLAG=-fPIC
 FPICFLAG=-fPIC
-SHLEXT=so
-SHLLIB="${SHLEXT}"
-SHLBIN=
-SHLEXT_VER="${SHLEXT}.${version}"
-SHLLIB_VER="${SHLLIB}.${version}"
-SHLBIN_VER="${SHLBIN}.${version}"
-LIBPRE=lib
-SHLPRE=lib
-SHLLIBPRE=lib
-SHLBINPRE=lib
 SH_LD="${CXX}"
 SH_LDFLAGS=-shared
 DL_LD="${SH_LD}"
 DL_LDFLAGS="${SH_LDFLAGS}"
 MKOCTFILE_DL_LDFLAGS="${DL_LDFLAGS}"
-SONAME_FLAGS=
 NO_OCT_FILE_STRIP=false
 TEMPLATE_AR="${AR}"
 TEMPLATE_ARFLAGS="$ARFLAGS"
@@ -2059,27 +2048,15 @@
         FPICFLAG=
       ;;
     esac
-    SHLEXT=dylib
-    SHLLIB="${SHLEXT}"
-    SHLEXT_VER="${version}.${SHLEXT}"
-    SHLLIB_VER="${version}.${SHLLIB}"
     NO_OCT_FILE_STRIP=true
-    SONAME_FLAGS='-install_name ${octlibdir}/$@'
     library_path_var=DYLD_LIBRARY_PATH
   ;;
   *-*-cygwin*)
     CPICFLAG=
     CXXPICFLAG=
     FPICFLAG=
-    LIBPRE=lib
-    SHLPRE=cyg
-    SHLBINPRE=cyg
-    SHLEXT=dll
-    SHLLIB=dll.a
-    SHLBIN=dll
     DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc"
     SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base"
-    SONAME_FLAGS='-Wl,--out-implib=$(patsubst ${SHLPRE}%,${LIBPRE}%,$@).a'
     ldpreloadsep=":"
   ;;
   *-*-mingw*)
@@ -2088,13 +2065,6 @@
       CPICFLAG=
       CXXPICFLAG=
       FPICFLAG=
-      SHLEXT=dll
-      SHLLIB=lib
-      SHLBIN=dll
-      LIBPRE=
-      SHLPRE=
-      SHLLIBPRE=
-      SHLBINPRE=
       SH_LDFLAGS="-shared"
       if test -n "`echo $CFLAGS | $GREP -e '-g'`" || test -n "`echo $CXXFLAGS | $GREP -e '-g'`"; then
         DL_LDFLAGS="$DL_LDFLAGS -g"
@@ -2112,12 +2082,8 @@
       CPICFLAG=
       CXXPICFLAG=
       FPICFLAG=
-      SHLEXT=dll
-      SHLLIB=dll.a
-      SHLBIN=dll
       DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc"
       SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base"
-      SONAME_FLAGS='-Wl,--out-implib=$@.a'
       library_path_var=PATH
     fi
   ;;
@@ -2127,13 +2093,6 @@
     CPICFLAG=
     CXXPICFLAG=
     FPICFLAG=
-    SHLEXT=dll
-    SHLLIB=lib
-    SHLBIN=dll
-    LIBPRE=
-    SHLPRE=
-    SHLLIBPRE=
-    SHLBINPRE=
     SH_LDFLAGS="-shared"
     if test -n "`echo $CFLAGS | $GREP -e '-g'`" || test -n "`echo $CXXFLAGS | $GREP -e '-g'`"; then
       DL_LDFLAGS="$DL_LDFLAGS -g"
@@ -2149,10 +2108,8 @@
   ;;
   *-*-linux* | *-*-gnu*)
     MKOCTFILE_DL_LDFLAGS="-shared -Wl,-Bsymbolic"
-    SONAME_FLAGS='-Wl,-soname -Wl,$@'
   ;;
   i[[3456]]86-*-sco3.2v5*)
-    SONAME_FLAGS='-Wl,-h -Wl,$@'
     SH_LDFLAGS=-G
   ;;
   rs6000-ibm-aix* | powerpc-ibm-aix*)
@@ -2167,7 +2124,6 @@
     else
       FPICFLAG=+Z
     fi
-    SHLEXT=sl
     SH_LDFLAGS="-shared -fPIC"
     library_path_var=SHLIB_PATH
   ;;
@@ -2222,22 +2178,11 @@
 AC_MSG_NOTICE([defining FPICFLAG to be $FPICFLAG])
 AC_MSG_NOTICE([defining CPICFLAG to be $CPICFLAG])
 AC_MSG_NOTICE([defining CXXPICFLAG to be $CXXPICFLAG])
-AC_MSG_NOTICE([defining SHLEXT to be $SHLEXT])
-AC_MSG_NOTICE([defining SHLLIB to be $SHLLIB])
-AC_MSG_NOTICE([defining SHLBIN to be $SHLBIN])
-AC_MSG_NOTICE([defining SHLEXT_VER to be $SHLEXT_VER])
-AC_MSG_NOTICE([defining SHLLIB_VER to be $SHLLIB_VER])
-AC_MSG_NOTICE([defining SHLBIN_VER to be $SHLBIN_VER])
-AC_MSG_NOTICE([defining LIBPRE to be $LIBPRE])
-AC_MSG_NOTICE([defining SHLPRE to be $SHLPRE])
-AC_MSG_NOTICE([defining SHLLIBPRE to be $SHLLIBPRE])
-AC_MSG_NOTICE([defining SHLBINPRE to be $SHLBINPRE])
 AC_MSG_NOTICE([defining SH_LD to be $SH_LD])
 AC_MSG_NOTICE([defining SH_LDFLAGS to be $SH_LDFLAGS])
 AC_MSG_NOTICE([defining DL_LD to be $DL_LD])
 AC_MSG_NOTICE([defining DL_LDFLAGS to be $DL_LDFLAGS])
 AC_MSG_NOTICE([defining MKOCTFILE_DL_LDFLAGS to be $MKOCTFILE_DL_LDFLAGS])
-AC_MSG_NOTICE([defining SONAME_FLAGS to be $SONAME_FLAGS])
 AC_MSG_NOTICE([defining NO_OCT_FILE_STRIP to be $NO_OCT_FILE_STRIP])
 AC_MSG_NOTICE([defining TEMPLATE_AR to be $TEMPLATE_AR])
 AC_MSG_NOTICE([defining TEMPLATE_ARFLAGS to be $TEMPLATE_ARFLAGS])
@@ -2250,22 +2195,11 @@
 AC_SUBST(FPICFLAG)
 AC_SUBST(CPICFLAG)
 AC_SUBST(CXXPICFLAG)
-AC_SUBST(SHLEXT)
-AC_SUBST(SHLLIB)
-AC_SUBST(SHLBIN)
-AC_SUBST(SHLEXT_VER)
-AC_SUBST(SHLLIB_VER)
-AC_SUBST(SHLBIN_VER)
-AC_SUBST(LIBPRE)
-AC_SUBST(SHLPRE)
-AC_SUBST(SHLLIBPRE)
-AC_SUBST(SHLBINPRE)
 AC_SUBST(SH_LD)
 AC_SUBST(SH_LDFLAGS)
 AC_SUBST(DL_LD)
 AC_SUBST(DL_LDFLAGS)
 AC_SUBST(MKOCTFILE_DL_LDFLAGS)
-AC_SUBST(SONAME_FLAGS)
 AC_SUBST(NO_OCT_FILE_STRIP)
 AC_SUBST(TEMPLATE_AR)
 AC_SUBST(TEMPLATE_ARFLAGS)
@@ -2303,9 +2237,6 @@
   [link_all_deps=no])
 AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], [test $link_all_deps = yes])
 
-LIBEXT=a
-AC_SUBST(LIBEXT)
-
 ## Dynamic linking is now enabled only if we are building shared
 ## libs and some API for dynamic linking has been detected.
 
@@ -2376,8 +2307,8 @@
   LIBOCTINTERP="-loctinterp"
   LIBOCTAVE="-loctave"
 else
-  LIBOCTINTERP="${top_builddir}/libinterp/liboctinterp.${LIBEXT}"
-  LIBOCTAVE="${top_builddir}/liboctave/liboctave.${LIBEXT}"
+  LIBOCTINTERP="${top_builddir}/libinterp/liboctinterp.a"
+  LIBOCTAVE="${top_builddir}/liboctave/liboctave.a"
 fi
 
 AC_SUBST(LD_CXX)
--- a/libinterp/build-env.h	Wed Jun 15 09:02:17 2016 -0700
+++ b/libinterp/build-env.h	Wed Jun 15 10:21:48 2016 -0700
@@ -111,7 +111,6 @@
     extern const char *LEXLIB;
     extern const char *LEX;
     extern const char *LFLAGS;
-    extern const char *LIBEXT;
     extern const char *LIBOCTAVE;
     extern const char *LIBOCTINTERP;
     extern const char *LIBS;
@@ -152,8 +151,6 @@
     extern const char *READLINE_LIBS;
     extern const char *SED;
     extern const char *SHARED_LIBS;
-    extern const char *SHLEXT;
-    extern const char *SHLEXT_VER;
     extern const char *SH_LD;
     extern const char *SH_LDFLAGS;
     extern const char *STATIC_LIBS;
--- a/libinterp/build-env.in.cc	Wed Jun 15 09:02:17 2016 -0700
+++ b/libinterp/build-env.in.cc	Wed Jun 15 10:21:48 2016 -0700
@@ -187,8 +187,6 @@
 
     const char *LFLAGS = %OCTAVE_CONF_LFLAGS%;
 
-    const char *LIBEXT = %OCTAVE_CONF_LIBEXT%;
-
     const char *LIBOCTAVE = %OCTAVE_CONF_LIBOCTAVE%;
 
     const char *LIBOCTINTERP = %OCTAVE_CONF_LIBOCTINTERP%;
@@ -269,10 +267,6 @@
 
     const char *SHARED_LIBS = %OCTAVE_CONF_SHARED_LIBS%;
 
-    const char *SHLEXT = %OCTAVE_CONF_SHLEXT%;
-
-    const char *SHLEXT_VER = %OCTAVE_CONF_SHLEXT_VER%;
-
     const char *SH_LD = %OCTAVE_CONF_SH_LD%;
 
     const char *SH_LDFLAGS = %OCTAVE_CONF_SH_LDFLAGS%;
--- a/libinterp/corefcn/toplev.cc	Wed Jun 15 09:02:17 2016 -0700
+++ b/libinterp/corefcn/toplev.cc	Wed Jun 15 10:21:48 2016 -0700
@@ -1526,7 +1526,6 @@
       { "LEX", octave::build_env::LEX },
       { "LEXLIB", octave::build_env::LEXLIB },
       { "LFLAGS", octave::build_env::LFLAGS },
-      { "LIBEXT", octave::build_env::LIBEXT },
       { "LIBOCTAVE", octave::build_env::LIBOCTAVE },
       { "LIBOCTINTERP", octave::build_env::LIBOCTINTERP },
       { "LIBS", octave::build_env::LIBS },
@@ -1564,8 +1563,6 @@
       { "READLINE_LIBS", octave::build_env::READLINE_LIBS },
       { "SED", octave::build_env::SED },
       { "SHARED_LIBS", octave::build_env::SHARED_LIBS },
-      { "SHLEXT", octave::build_env::SHLEXT },
-      { "SHLEXT_VER", octave::build_env::SHLEXT_VER },
       { "SH_LD", octave::build_env::SH_LD },
       { "SH_LDFLAGS", octave::build_env::SH_LDFLAGS },
       { "STATIC_LIBS", octave::build_env::STATIC_LIBS },
--- a/src/octave-config.in.cc	Wed Jun 15 09:02:17 2016 -0700
+++ b/src/octave-config.in.cc	Wed Jun 15 10:21:48 2016 -0700
@@ -71,9 +71,9 @@
 "                          INFODIR                OCTINCLUDEDIR\n"
 "                          INFOFILE               OCTLIBDIR\n"
 "                          LIBDIR                 PREFIX\n"
-"                          LIBEXECDIR             SHLEXT\n"
-"                          LOCALAPIARCHLIBDIR     STARTUPFILEDIR\n"
-"                          LOCALAPIFCNFILEDIR     VERSION\n"
+"                          LIBEXECDIR             STARTUPFILEDIR\n"
+"                          LOCALAPIARCHLIBDIR     VERSION\n"
+"                          LOCALAPIFCNFILEDIR\n"
 "                          LOCALAPIOCTFILEDIR\n"
 "\n"
 "  -v, --version         Print the Octave version number.\n"
@@ -120,7 +120,6 @@
   vars["OCTFILEDIR"] = subst_octave_home (%OCTAVE_OCTFILEDIR%);
   vars["OCTINCLUDEDIR"] = subst_octave_home (%OCTAVE_OCTINCLUDEDIR%);
   vars["OCTLIBDIR"] = subst_octave_home (%OCTAVE_OCTLIBDIR%);
-  vars["SHLEXT"] = subst_octave_home (%OCTAVE_SHLEXT%);
   vars["STARTUPFILEDIR"] = subst_octave_home (%OCTAVE_STARTUPFILEDIR%);
 }