Date: Sat, 16 May 2015 11:23:06 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386518 - head/math/scilab Message-ID: <201505161123.t4GBN6jS009329@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Sat May 16 11:23:06 2015 New Revision: 386518 URL: https://svnweb.freebsd.org/changeset/ports/386518 Log: math/scilab: - Clean up blas/lapack usage Based on patch, provided by maho@ via email. Modified: head/math/scilab/Makefile Modified: head/math/scilab/Makefile ============================================================================== --- head/math/scilab/Makefile Sat May 16 11:11:08 2015 (r386517) +++ head/math/scilab/Makefile Sat May 16 11:23:06 2015 (r386518) @@ -32,16 +32,21 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-gfortran \ --without-emf \ -disable-static-system-lib -CONFIGURE_ENV= BLAS_LIBS="${BLAS_LIBS}" LAPACK_LIBS="${LAPACK_LIBS}" +CONFIGURE_ENV= BLAS_LIBS="${BLASLIB}" LAPACK_LIBS="${LAPACKLIB}" MAKE_ENV= LANG=en_US.UTF-8 \ LC_ALL=en_US.UTF-8 INSTALL_TARGET= install-strip -OPTIONS_DEFINE= ATLAS GUI OCAML TK -OPTIONS_DEFAULT= GUI OCAML TK +OPTIONS_DEFINE= GUI OCAML TK +OPTIONS_RADIO= BLAS +OPTIONS_RADIO_BLAS= ATLAS NETLIB OPENBLAS +OPTIONS_DEFAULT= GUI NETLIB OCAML TK OPTIONS_SUB= yes -ATLAS_DESC= Use Atlas instead of Blas +ATLAS_USES= blaslapack:atlas +NETLIB_USES= blaslapack:netlib +OPENBLAS_USES= blaslapack:openblas + GUI_DESC= Graphical User Interface (Java) OCAML_DESC= Scicos - dynamical system simulator (requires GUI) @@ -107,17 +112,6 @@ TK_USE= XORG=x11 .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MATLAS} -LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas -BLAS_LIBS= -lf77blas -LAPACK_LIBS= -lalapack -lcblas -.else -LIB_DEPENDS+= liblapack.so:${PORTSDIR}/math/lapack \ - libblas.so:${PORTSDIR}/math/blas -BLAS_LIBS= -lblas -LAPACK_LIBS= -llapack -.endif - .if ${PORT_OPTIONS:MGUI} USE_JAVA= yes # bsdjava (ie java/jdk16) doesn't have some "extra" classes that aren't in
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505161123.t4GBN6jS009329>