svn commit: r376804 - head/graphics/cimg
Thierry Thomas
thierry at FreeBSD.org
Sun Jan 11 21:06:03 UTC 2015
Author: thierry
Date: Sun Jan 11 21:06:02 2015
New Revision: 376804
URL: https://svnweb.freebsd.org/changeset/ports/376804
QAT: https://qat.redports.org/buildarchive/r376804/
Log:
Uses blaslapack.mk.
Modified:
head/graphics/cimg/Makefile
Modified: head/graphics/cimg/Makefile
==============================================================================
--- head/graphics/cimg/Makefile Sun Jan 11 21:05:21 2015 (r376803)
+++ head/graphics/cimg/Makefile Sun Jan 11 21:06:02 2015 (r376804)
@@ -28,6 +28,15 @@ ONLY_FOR_ARCHS_REASON= "invokes i386 asm
TARBALLREVISION=3
USES= zip
+
+.if !defined(WITHOUT_LAPACK)
+. if defined(WITH_ATLAS)
+USES+= blaslapack:atlas
+. else
+USES+= blaslapack
+. endif
+.endif
+
WRKSRC= ${WRKDIR}/${DISTNAME:C/_/-/}
BUILD_WRKSRC= ${WRKSRC}/examples
MAKE_ENV= X11PATH=${LOCALBASE} LOCALBASE=${LOCALBASE}
@@ -92,22 +101,6 @@ NO_BUILD= yes
.include <bsd.port.pre.mk>
-.if ${PORT_OPTIONS:MDOCS}
-. if !defined(WITHOUT_LAPACK)
-. if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS)
-WITH_ATLAS= yes
-. endif
-. if defined(WITH_ATLAS)
-LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas
-LAPACK_LIB= -L${LOCALBASE}/lib -lalapack -lcblas -lf77blas
-. else
-LIB_DEPENDS+= libblas.so:${PORTSDIR}/math/blas
-LIB_DEPENDS+= liblapack.so:${PORTSDIR}/math/lapack
-LAPACK_LIB= -L${LOCALBASE}/lib -llapack -lblas
-. endif
-. endif
-.endif
-
pre-configure:
.if ${PORT_OPTIONS:MDOCS}
${REINPLACE_CMD} -e 's|make|${MAKE_CMD}|' ${BUILD_WRKSRC}/Makefile
@@ -120,9 +113,9 @@ pre-configure:
${BUILD_WRKSRC}/Makefile
. endif
. if !defined(WITHOUT_LAPACK)
- ${REINPLACE_CMD} -e 's|#CIMG_LAPACK_CFLAGS|CIMG_LAPACK_CFLAGS|' \
- -e 's|#CIMG_LAPACK_LDFLAGS|CIMG_LAPACK_LDFLAGS|' \
- -e 's|-lblas -llapack|${LAPACK_LIB}|' \
+ ${REINPLACE_CMD} -e 's|#CIMG_LAPACK_CFLAGS|CIMG_LAPACK_CFLAGS|' \
+ -e 's|#CIMG_LAPACK_LDFLAGS|CIMG_LAPACK_LDFLAGS|' \
+ -e 's|-lblas -llapack|-L${LOCALBASE}/lib ${BLASLIB} ${LAPACKLIB}|' \
${BUILD_WRKSRC}/Makefile
. endif
. if defined(WITH_XSHM)
More information about the svn-ports-head
mailing list