Mercurial > forge
changeset 10391:cf985eb1e0f2 octave-forge
Pass linker flags with better compatibility.
| author | i7tiol |
|---|---|
| date | Thu, 07 Jun 2012 09:33:21 +0000 |
| parents | fc937a1bd9c7 |
| children | f500d9122ea8 |
| files | main/optim/DESCRIPTION main/optim/inst/nonlin_min.m main/optim/src/Makefile |
| diffstat | 3 files changed, 13 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/main/optim/DESCRIPTION Thu Jun 07 08:27:45 2012 +0000 +++ b/main/optim/DESCRIPTION Thu Jun 07 09:33:21 2012 +0000 @@ -1,6 +1,6 @@ Name: Optim -Version: 1.1.0 -Date: 2012-05-24 +Version: 1.1.1 +Date: 2012-06-07 Author: various authors Maintainer: Octave-Forge community <octave-dev@lists.sourceforge.net> Title: Optimization.
--- a/main/optim/inst/nonlin_min.m Thu Jun 07 08:27:45 2012 +0000 +++ b/main/optim/inst/nonlin_min.m Thu Jun 07 09:33:21 2012 +0000 @@ -1283,12 +1283,12 @@ function backend = map_backend (backend) switch (backend) - case "bfgs_infeasible" + case "sqp_infeasible" backend = "__sqp__"; case "sqp" backend = "__sqp__"; - case "bfgs_feasible" - backend = "__bfgs_feasible__"; + case "sqp_feasible" + backend = "__sqp_feasible__"; case "siman" backend = "__siman__"; otherwise
--- a/main/optim/src/Makefile Thu Jun 07 08:27:45 2012 +0000 +++ b/main/optim/src/Makefile Thu Jun 07 09:33:21 2012 +0000 @@ -5,10 +5,17 @@ # <carlo.defalco@gmail.com> BLAS_LIBS := $(shell $(MKOCTFILE) -p BLAS_LIBS) +# Passing LFLAGS, supplemented with LAPACK_LIBS and BLAS_LIBS, in the +# environment to mkoctfile is prefered over passing LAPACK_LIBS and +# BLAS_LIBS in mkoctfiles commandline due to mkoctfiles difficulties +# with non-standard flags on some systems (e.g. -framework ... on +# Apple) +LFLAGS := $(shell $(MKOCTFILE) -p LFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) + all: __bfgsmin.oct numgradient.oct numhessian.oct samin.oct __disna_optim__.oct %.oct: %.cc - $(MKOCTFILE) -s $< $(LAPACK_LIBS) $(BLAS_LIBS) + LFLAGS="$(LFLAGS)" $(MKOCTFILE) -s $< clean: $(RM) *.o core octave-core *.oct *~