Mercurial > octave
changeset 18349:50505bf88b82 stable
make octave-config and mkoctfile consistent with last shell script versions
* mkoctfile.in.cc, octave-config.in.cc: Update to match latest shell
script versions.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 23 Jan 2014 16:14:50 -0500 |
| parents | 238aa26b30e3 |
| children | 26eac61ebab2 c460566106f0 |
| files | src/mkoctfile.in.cc src/octave-config.in.cc |
| diffstat | 2 files changed, 60 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
--- a/src/mkoctfile.in.cc Thu Jan 23 12:49:07 2014 -0800 +++ b/src/mkoctfile.in.cc Thu Jan 23 16:14:50 2014 -0500 @@ -244,11 +244,14 @@ vars["FFTW3F_LIBS"] = get_variable ("FFTW3F_LIBS", %OCTAVE_CONF_FFTW3F_LIBS%); vars["LIBS"] = get_variable ("LIBS", %OCTAVE_CONF_LIBS%); vars["FLIBS"] = get_variable ("FLIBS", %OCTAVE_CONF_FLIBS%); - vars["OCTAVE_LINK_DEPS"] = get_variable ("FLIBS", + vars["OCTAVE_LINK_DEPS"] = get_variable ("OCTAVE_LINK_DEPS", %OCTAVE_CONF_OCTAVE_LINK_DEPS%); - vars["OCT_LINK_DEPS"] = get_variable ("FLIBS", %OCTAVE_CONF_OCT_LINK_DEPS%); - vars["FLIBS"] = get_variable ("FLIBS", %OCTAVE_CONF_FLIBS%); - + vars["OCTAVE_LINK_OPTS"] = get_variable ("OCTAVE_LINK_OPTS", + %OCTAVE_CONF_OCTAVE_LINK_OPTS%); + vars["OCT_LINK_DEPS"] = get_variable ("OCT_LINK_DEPS", + %OCTAVE_CONF_OCT_LINK_DEPS%); + vars["OCT_LINK_OPTS"] = get_variable ("OCT_LINK_OPTS", + %OCTAVE_CONF_OCT_LINK_OPTS%); vars["LD_CXX"] = get_variable ("LD_CXX", %OCTAVE_CONF_MKOCTFILE_LD_CXX%); vars["LDFLAGS"] = get_variable ("LDFLAGS", %OCTAVE_CONF_LDFLAGS%); vars["LD_STATIC_FLAG"] = get_variable ("LD_STATIC_FLAG", @@ -296,6 +299,10 @@ "\n" " -M, --depend Generate dependency files (.d) for C and C++\n" " source files.\n" +#if ! defined (__WIN32__) || defined (_POSIX_VERSION) +"\n" +" -pthread Add -pthread to link command.\n" +#endif "\n" " -RDIR Add -RDIR to link command.\n" "\n" @@ -314,29 +321,33 @@ " -p VAR, --print VAR Print configuration variable VAR. Recognized\n" " variables are:\n" "\n" -" ALL_CFLAGS FFTW3F_LDFLAGS\n" -" ALL_CXXFLAGS FFTW3F_LIBS\n" -" ALL_FFLAGS FLIBS\n" -" ALL_LDFLAGS FPICFLAG\n" -" AR INCFLAGS\n" -" BLAS_LIBS LAPACK_LIBS\n" -" CC LDFLAGS\n" -" CFLAGS LD_CXX\n" -" CPICFLAG LD_STATIC_FLAG\n" -" CPPFLAGS LFLAGS\n" -" CXX LIBOCTAVE\n" -" CXXFLAGS LIBOCTINTERP\n" -" CXXPICFLAG LIBS\n" -" DEPEND_EXTRA_SED_PATTERN OCTAVE_LIBS\n" -" DEPEND_FLAGS OCTAVE_LINK_DEPS\n" -" DL_LD OCT_LINK_DEPS\n" -" DL_LDFLAGS RANLIB\n" -" EXEEXT RDYNAMIC_FLAG\n" -" F77 READLINE_LIBS\n" -" F77_INTEGER_8_FLAG SED\n" -" FFLAGS XTRA_CFLAGS\n" -" FFTW3_LDFLAGS XTRA_CXXFLAGS\n" -" FFTW3_LIBS\n" +" ALL_CFLAGS INCFLAGS\n" +" ALL_CXXFLAGS INCLUDEDIR\n" +" ALL_FFLAGS LAPACK_LIBS\n" +" ALL_LDFLAGS LD_CXX\n" +" AR LDFLAGS\n" +" BLAS_LIBS LD_STATIC_FLAG\n" +" CC LFLAGS\n" +" CFLAGS LIBDIR\n" +" CPICFLAG LIBOCTAVE\n" +" CPPFLAGS LIBOCTINTERP\n" +" CXX LIBS\n" +" CXXFLAGS OCTAVE_HOME\n" +" CXXPICFLAG OCTAVE_LIBS\n" +" DEPEND_EXTRA_SED_PATTERN OCTAVE_LINK_DEPS\n" +" DEPEND_FLAGS OCTAVE_LINK_OPTS\n" +" DL_LD OCTAVE_PREFIX\n" +" DL_LDFLAGS OCTINCLUDEDIR\n" +" F77 OCTLIBDIR\n" +" F77_INTEGER8_FLAG OCT_LINK_DEPS\n" +" FFLAGS OCT_LINK_OPTS\n" +" FFTW3F_LDFLAGS RANLIB\n" +" FFTW3F_LIBS RDYNAMIC_FLAG\n" +" FFTW3_LDFLAGS READLINE_LIBS\n" +" FFTW3_LIBS SED\n" +" FFTW_LIBS SPECIAL_MATH_LIB\n" +" FLIBS XTRA_CFLAGS\n" +" FPICFLAG XTRA_CXXFLAGS\n" "\n" " --link-stand-alone Link a stand-alone executable file.\n" "\n" @@ -525,6 +536,12 @@ { ldflags += (" " + arg); } +#if ! defined (__WIN32__) || defined (_POSIX_VERSION) + else if (arg == "-pthread") + { + ldflags += (" " + arg); + } +#endif else if (arg == "-M" || arg == "-depend" || arg == "--depend") { depend = true; @@ -781,7 +798,7 @@ + objfiles + " " + libfiles + " " + ldflags + " " + vars["LFLAGS"] + " -loctinterp -loctave " - + " " + vars["OCT_LINK_OPTS"] + + " " + vars["OCTAVE_LINK_OPTS"] + " " + vars["OCTAVE_LINK_DEPS"]; result = run_command (cmd); }
--- a/src/octave-config.in.cc Thu Jan 23 12:49:07 2014 -0800 +++ b/src/octave-config.in.cc Thu Jan 23 16:14:50 2014 -0500 @@ -53,23 +53,23 @@ " -p VAR, --print VAR Print the value of the given configuration\n" " variable VAR. Recognized variables are:\n" "\n" -" API_VERSION LOCALAPIARCHLIBDIR\n" -" CANONICAL_HOST_TYPE LOCALAPIFCNFILEDIR\n" -" DEFAULT_PAGER LOCALAPIOCTFILEDIR\n" +" API_VERSION LOCALAPIOCTFILEDIR\n" " ARCHLIBDIR LOCALARCHLIBDIR\n" " BINDIR LOCALFCNFILEDIR\n" -" DATADIR LOCALOCTFILEDIR\n" -" DATAROOTDIR LOCALSTARTUPFILEDIR\n" -" EXEC_PREFIX LOCALVERARCHLIBDIR\n" -" FCNFILEDIR LOCALVERFCNFILEDIR\n" -" LOCALVEROCTFILEDIR MAN1DIR\n" -" IMAGEDIR MANDIR\n" -" MAN1EXT OCTFILEDIR\n" -" INCLUDEDIR OCTINCLUDEDIR\n" -" INFODIR OCTLIBDIR\n" -" INFOFILE PREFIX\n" -" LIBDIR STARTUPFILEDIR\n" -" LIBEXECDIR VERSION\n" +" CANONICAL_HOST_TYPE LOCALOCTFILEDIR\n" +" DATADIR LOCALSTARTUPFILEDIR\n" +" DATAROOTDIR LOCALVERARCHLIBDIR\n" +" DEFAULT_PAGER LOCALVERFCNFILEDIR\n" +" EXEC_PREFIX LOCALVEROCTFILEDIR\n" +" FCNFILEDIR MAN1DIR\n" +" IMAGEDIR MAN1EXT\n" +" INCLUDEDIR MANDIR\n" +" INFODIR OCTFILEDIR\n" +" INFOFILE OCTINCLUDEDIR\n" +" LIBDIR OCTLIBDIR\n" +" LIBEXECDIR PREFIX\n" +" LOCALAPIARCHLIBDIR STARTUPFILEDIR\n" +" LOCALAPIFCNFILEDIR VERSION\n" "\n" " -v, --version Print the Octave version number.\n" "\n";