On Thu, May 24, 2012 at 11:04:55AM +0200, marco atzeri wrote:
> On 5/24/2012 10:02 AM, Olaf Till wrote:
> > On Wed, May 23, 2012 at 09:50:14PM +0200, c. wrote:
> >>
> >> On 23 May 2012, at 19:26, Olaf Till wrote:
> >>
> >>> So I think I'll load up a release tomorrow ...
> >>>
> >>> Olaf
> >>
> >> Please consider applying this additional change to the Makefile
> >> which is required when linkking Octave against Apple's VecLib framework
> >> and should do no harm otherwise.
> >>
> >> c.
> >
> > Ok, is included, thanks. Olaf
> >
> >> --- Makefile (revision 10506)
> >> +++ Makefile (working copy)
> >> @@ -3,11 +3,12 @@
> >> endif
> >>
> >> LAPACK_LIBS := $(shell mkoctfile -p LAPACK_LIBS)
> >> +BLAS_LIBS := $(shell mkoctfile -p BLAS_LIBS)
> >>
> >> all: __bfgsmin.oct numgradient.oct numhessian.oct samin.oct
> >> __disna_optim__.oct
> >>
> >> %.oct: %.cc
> >> - $(MKOCTFILE) -s $< ${LAPACK_LIBS}
> >> + $(MKOCTFILE) -s $< $(LAPACK_LIBS) $(BLAS_LIBS)
> >>
> >> clean:
> >> - -rm *.o core octave-core *.oct *~
> >> + $(RM) *.o core octave-core *.oct *~
> >>
> >
> some other packages could need the same change:
>
> $ grep -rH LAPACK_LIBS *
> extra/control-devel/devel/dksyn/makefile_dksyn.m: "$(mkoctfile -p
> LAPACK_LIBS)" \
> extra/control-devel/src/Makefile:# LAPACK_LIBS := $(shell mkoctfile -p
> LAPACK_LIBS)
> main/control/src/Makefile:# LAPACK_LIBS := $(shell mkoctfile -p LAPACK_LIBS)
> main/linear-algebra/src/Makefile:LAPACK_LIBS := $(shell mkoctfile -p
> LAPACK_LIBS)
> main/linear-algebra/src/Makefile: $(MKOCTFILE) $(DEFINES)
> $(GSVD_OBJECTS) -o $@ ${LAPACK_LIBS}
> main/linear-algebra/src/Makefile: mkoctfile $(DEFINES) $< -o $@
> ${LAPACK_LIBS}
> main/octgpr/src/configure.base:if test -z "$LAPACK_LIBS"; then
> main/octgpr/src/configure.base: LAPACK_LIBS=`$MKOCTFILE -p BLAS_LIBS`
> main/octgpr/src/configure.base: echo "$LAPACK_LIBS"
> main/octgpr/src/configure.base: echo "user specified LAPACK libs:
> $LAPACK_LIBS"
> main/octgpr/src/configure.base:LIBS="$LIBS $LAPACK_LIBS"
> main/odepkg/src/Makefile:LAPACK_LIBS := $(shell mkoctfile -p LAPACK_LIBS)
> main/odepkg/src/Makefile: $(LAPACK_LIBS) $(FLIBS)
> main/optim/src/Makefile:LAPACK_LIBS := $(shell $(MKOCTFILE) -p LAPACK_LIBS)
> main/optim/src/Makefile: $(MKOCTFILE) -s $< $(LAPACK_LIBS)
> $(BLAS_LIBS)
> main/optiminterp/src/Makefile:LAPACK_LIBS := $(shell mkoctfile -p
> LAPACK_LIBS)
> main/optiminterp/src/Makefile: $(MKOCTFILE) -o $@ $(OBJECTS) $(LIBS)
> $(LAPACK_LIBS) $(FLIBS)If this change should be made for these packages, I'd advice to use $(shell $(MKOCTFILE) -p ..._LIBS) instead of $(shell mkoctfile -p ..._LIBS) (and to insert MKOCTFILE ?= mkoctfile before where necessary) to use the MKOCTFILE variable consistently. Olaf -- public key id EAFE0591, e.g. on x-hkp://pool.sks-keyservers.net
signature.asc
Description: Digital signature
------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________ Octave-dev mailing list Octave-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/octave-dev
