Date: Mon, 29 Nov 2010 11:03:00 GMT From: Eijiro Shibusawa <phd_kimberlite@yahoo.co.jp> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/152666: [maintainer-update] math/levmar Message-ID: <201011291103.oATB30Hk043396@red.freebsd.org> Resent-Message-ID: <201011291110.oATBAAj1055146@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 152666 >Category: ports >Synopsis: [maintainer-update] math/levmar >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Nov 29 11:10:10 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Eijiro Shibusawa >Release: FreeBSD 8.1-RELEASE >Organization: >Environment: FreeBSD myhost.jp 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:36:49 UTC 2010 root@mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Attached patch includes the following modifications. * WITH_BLAS knob was updated for GotoBLAS (math/gotoblas) support. * distinfo was updated for fixing portlint error (MD5 checksum was deleted). * some minor changes are added. If optimized BLAS library (e.g., math/atlas, math/gotoblas) is installed this port automatically uses it except for the case where user defines WITH_BLAS knob explicitly. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -uNr /usr/ports/math/levmar/Makefile ./Makefile --- /usr/ports/math/levmar/Makefile 2010-08-25 15:42:48.000000000 +0900 +++ ./Makefile 2010-11-29 19:59:00.000000000 +0900 @@ -7,6 +7,7 @@ PORTNAME= levmar PORTVERSION= 2.5 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://www.ics.forth.gr/~lourakis/levmar/ EXTRACT_SUFX= .tgz @@ -19,7 +20,11 @@ USE_LDCONFIG= yes USE_FORTRAN= yes -.if exists(${LOCALBASE}/lib/libatlas.so) +.include <bsd.port.pre.mk> + +.if exists(${LOCALBASE}/lib/libgoto2.so) +WITH_BLAS?= gotoblas +.elif exists(${LOCALBASE}/lib/libatlas_r.so) WITH_BLAS?= atlas .else WITH_BLAS?= reference @@ -27,13 +32,18 @@ .if ${WITH_BLAS} == "reference" LIB_DEPENDS= blas.2:${PORTSDIR}/math/blas \ - lapack.4:${PORTSDIR}/math/lapack -BLAS= -lblas -LAPACK = -llapack + lapack.4:${PORTSDIR}/math/lapack +BLAS= -lblas +LAPACK= -llapack +.elif ${WITH_BLAS} == "gotoblas" +LIB_DEPENDS= goto2:${PORTSDIR}/math/gotoblas \ + lapack.4:${PORTSDIR}/math/lapack +BLAS= -lpthread -lgoto2p +LAPACK= -lpthread -lgoto2p .elif ${WITH_BLAS} == "atlas" LIB_DEPENDS= atlas:${PORTSDIR}/math/atlas -BLAS= -lf77blas -lcblas -latlas -LAPACK = -lalapack +BLAS= -pthread -lptf77blas -lptcblas -latlas_r +LAPACK= -pthread -lalapack_r .endif LDFLAGS+= -L${LOCALBASE}/lib @@ -78,4 +88,4 @@ @(cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}) .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -uNr /usr/ports/math/levmar/distinfo ./distinfo --- /usr/ports/math/levmar/distinfo 2010-08-25 15:42:48.000000000 +0900 +++ ./distinfo 2010-11-29 19:58:58.000000000 +0900 @@ -1,3 +1,2 @@ -MD5 (levmar-2.5.tgz) = 7ca14d79eda6e985f8355b719ae47d35 SHA256 (levmar-2.5.tgz) = b70f6ac3eff30ec29150e217b137312cb84e85529815efea2c12e4eab74b9d75 SIZE (levmar-2.5.tgz) = 78817 diff -uNr /usr/ports/math/levmar/files/Makefile.demo ./files/Makefile.demo --- /usr/ports/math/levmar/files/Makefile.demo 2010-08-25 15:42:48.000000000 +0900 +++ ./files/Makefile.demo 2010-11-29 19:59:09.000000000 +0900 @@ -3,7 +3,7 @@ LDFLAGS= %%LDFLAGS%% LAPACK= %%LAPACK%% BLAS= %%BLAS%% -LIBS= -llevmar $(LAPACK) $(BLAS) -lm -lgfortran +LIBS= -llevmar $(LAPACK) $(BLAS) -lm -lgcc_s -lgfortran DEMOBJS= lmdemo.o DEMOSRCS= lmdemo.c @@ -11,7 +11,7 @@ all: lmdemo lmdemo: $(DEMOBJS) - $(CC) $(LDFLAGS) $(DEMOBJS) -o lmdemo $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) $(DEMOBJS) -o lmdemo $(LIBS) clean: @rm -f $(DEMOBJS) >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011291103.oATB30Hk043396>