[Octave-cvsupdate] SF.net SVN: octave:[10577] trunk/octave-forge/main/optim

[<i7...@us...>]

Revision: 10577
          http://octave.svn.sourceforge.net/octave/?rev=10577&view=rev
Author:   i7tiol
Date:     2012-06-07 09:33:21 +0000 (Thu, 07 Jun 2012)
Log Message:
-----------
Pass linker flags with better compatibility.

Modified Paths:
--------------
    trunk/octave-forge/main/optim/DESCRIPTION
    trunk/octave-forge/main/optim/inst/nonlin_min.m
    trunk/octave-forge/main/optim/src/Makefile

Modified: trunk/octave-forge/main/optim/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/optim/DESCRIPTION	2012-06-07 08:27:45 UTC (rev 10576)
+++ trunk/octave-forge/main/optim/DESCRIPTION	2012-06-07 09:33:21 UTC (rev 10577)
@@ -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 <oct...@li...>
 Title: Optimization.

Modified: trunk/octave-forge/main/optim/inst/nonlin_min.m
===================================================================
--- trunk/octave-forge/main/optim/inst/nonlin_min.m	2012-06-07 08:27:45 UTC (rev 10576)
+++ trunk/octave-forge/main/optim/inst/nonlin_min.m	2012-06-07 09:33:21 UTC (rev 10577)
@@ -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

Modified: trunk/octave-forge/main/optim/src/Makefile
===================================================================
--- trunk/octave-forge/main/optim/src/Makefile	2012-06-07 08:27:45 UTC (rev 10576)
+++ trunk/octave-forge/main/optim/src/Makefile	2012-06-07 09:33:21 UTC (rev 10577)
@@ -5,10 +5,17 @@
 # <car...@gm...>
 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 *~

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.