From owner-svn-ports-all@FreeBSD.ORG Mon Jan 5 23:03:44 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 783DB3A8; Mon, 5 Jan 2015 23:03:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6402164070; Mon, 5 Jan 2015 23:03:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t05N3ikQ000578; Mon, 5 Jan 2015 23:03:44 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t05N3hr3000576; Mon, 5 Jan 2015 23:03:43 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <201501052303.t05N3hr3000576@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Mon, 5 Jan 2015 23:03:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376370 - in head/math/lapack95: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Jan 2015 23:03:44 -0000 Author: thierry Date: Mon Jan 5 23:03:42 2015 New Revision: 376370 URL: https://svnweb.freebsd.org/changeset/ports/376370 QAT: https://qat.redports.org/buildarchive/r376370/ Log: - Uses the new blaslapack.mk; - Remove some warnings; - Optionify (without checking if ATLAS is installed). Modified: head/math/lapack95/Makefile head/math/lapack95/files/patch-make.inc Modified: head/math/lapack95/Makefile ============================================================================== --- head/math/lapack95/Makefile Mon Jan 5 23:03:40 2015 (r376369) +++ head/math/lapack95/Makefile Mon Jan 5 23:03:42 2015 (r376370) @@ -13,12 +13,23 @@ MAINTAINER= ports@FreeBSD.org COMMENT= LAPACK95, Fortran90/95 wrapper for LAPACK USES= fortran tar:tgz + +OPTIONS_RADIO= BLAS +OPTIONS_RADIO_BLAS= REFERENCE ATLAS +OPTIONS_DEFAULT= REFERENCE + +REFERENCE_DESC= Blas / Lapack +REFERENCE_USES= blaslapack:netlib + +ATLAS_DESC= ATLAS +ATLAS_USES= blaslapack:atlas + USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/LAPACK95 MAKE_JOBS_UNSAFE=yes -.include +.include .if ${ARCH} == "sparc64" PICFLAG?= -fPIC @@ -26,32 +37,15 @@ PICFLAG?= -fPIC PICFLAG?= -fpic .endif -.if exists(${LOCALBASE}/lib/libatlas.so) -WITH_BLAS?= atlas -.else -WITH_BLAS?= reference -.endif - -.if ${WITH_BLAS} == atlas -LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas -BLAS= -lf77blas -LAPACK= -lalapack -lcblas -.else -LIB_DEPENDS+= libblas.so:${PORTSDIR}/math/blas -LIB_DEPENDS+= liblapack.so:${PORTSDIR}/math/lapack -BLAS= -lblas -LAPACK= -llapack -.endif - .if ${PORT_OPTIONS:MEXAMPLES} PORTEXAMPLES= make.inc EXAMPLES1 EXAMPLES2 .endif pre-configure: - ${REINPLACE_CMD} -e 's|%%BLAS%%|${BLAS}|g ; \ + ${REINPLACE_CMD} -e 's|%%BLAS%%|${BLASLIB}|g ; \ s|%%FC%%|${FC}|g ; \ s|%%FFLAGS%%|${FFLAGS} $${PICFLAG}|g ; \ - s|%%LAPACK%%|${LAPACK}|g ; \ + s|%%LAPACK%%|${LAPACKLIB}|g ; \ s|%%LDFLAGS%%|${LDFLAGS}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g ; \ s|%%PREFIX%%|${PREFIX}|g' \ @@ -61,6 +55,7 @@ pre-configure: ${WRKSRC}/SRC/makefile \ ${WRKSRC}/TESTING/makefile \ ${WRKSRC}/EXAMPLES1/makefile* + ${MKDIR} ${WRKSRC}/lapack95_modules ${CP} -r ${WRKSRC} ${WRKSRC}_SHARED do-build: @@ -82,4 +77,4 @@ do-install: cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTEXAMPLES}" ${STAGEDIR}${EXAMPLESDIR} .endif -.include +.include Modified: head/math/lapack95/files/patch-make.inc ============================================================================== --- head/math/lapack95/files/patch-make.inc Mon Jan 5 23:03:40 2015 (r376369) +++ head/math/lapack95/files/patch-make.inc Mon Jan 5 23:03:42 2015 (r376370) @@ -1,5 +1,5 @@ ---- make.inc.orig 2000-11-30 08:18:37.000000000 -0500 -+++ make.inc 2011-07-21 02:46:07.000000000 -0400 +--- make.inc.orig 2000-11-30 14:18:37.000000000 +0100 ++++ make.inc 2015-01-05 23:43:55.000000000 +0100 @@ -3,8 +3,8 @@ # UNI-C, Denmark; Univ. of Tennessee, USA; NAG Ltd., UK # August 5, 2000 @@ -16,9 +16,8 @@ # including non-stop arithmetic. -OPTS0 = -u -V -dcfuns -dusty -ieee=full --MODLIB = -I./../lapack95_modules +OPTS0 = %%FFLAGS%% #-u -V -dcfuns -dusty -ieee=full -+MODLIB = -I./../lapack95_modules -I%%PREFIX%%/lib/lapack95_modules + MODLIB = -I./../lapack95_modules OPTS1 = -c $(OPTS0) OPTS3 = $(OPTS1) $(MODLIB) OPTL = -o