Attachment 88047 Details for Bug 124786 – file.diff

[patch] file.diff

file.diff (text/plain), 2.58 KB, created by Pedro F. Giffuni on 2008-06-20 16:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2008-06-20 16:20:01 UTC

Size: 2.58 KB

patch

obsolete

>diff -ruN superlu.orig/Makefile superlu/Makefile
>--- superlu.orig/Makefile	2008-06-19 17:38:56.000000000 -0500
>+++ superlu/Makefile	2008-06-20 10:00:23.000000000 -0500
>@@ -26,34 +26,27 @@
> .endif
> .if defined(WITH_ATLAS)
> LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
>-BLAS=		-lf77blas -latlas
>-LAPACK=		-lalapack
>+BLAS_LIBS=	-lf77blas -latlas
> .else
> LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/lapack
> LIB_DEPENDS+=	blas.2:${PORTSDIR}/math/blas
>-BLAS=		-lblas
>-LAPACK=		-llapack
>+BLAS_LIBS=	-lblas
> .endif
> 
> USE_FORTRAN=	yes
> 
> P_VERSION=	3.0
> WRKSRC=		${WRKDIR}/SuperLU_${P_VERSION}
>-ALL_TARGET=	superlulib
>+ALL_TARGET=	lib
> 
> ARCH2FIX=	SRC/Makefile TESTING/MATGEN/Makefile CBLAS/Makefile make.inc	\
> 		MAKE_INC/make.alpha MAKE_INC/make.inc
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's+%%BLAS_LIBS%%+-L${LOCALBASE}/lib ${BLAS_LIBS}+' \
>-	${WRKSRC}/make.inc
>-	@${REINPLACE_CMD} -e 's+%%CC%%+${CC}+' \
>-	${WRKSRC}/make.inc
>-	@${REINPLACE_CMD} -e 's+%%FC%%+${FC}+' \
>-	${WRKSRC}/make.inc
>-	@${REINPLACE_CMD} -e 's+%%CFLAGS%%+${CFLAGS}+' \
>-	${WRKSRC}/make.inc
>-	@${REINPLACE_CMD} -e 's+%%FFLAGS%%+${FFLAGS}+' \
>+	@${REINPLACE_CMD} -e 's+%%BLAS_LIBS%%+-L${LOCALBASE}/lib ${BLAS_LIBS}+ ; \
>+			s+%%CC%%+${CC}+; s+%%FC%%+${FC}+; \
>+			s+%%CFLAGS%%+${CFLAGS}+; \
>+			s+%%FFLAGS%%+${FFLAGS}+' \
> 	${WRKSRC}/make.inc
> .for fmk in ${ARCH2FIX}
> 	@${REINPLACE_CMD} -e 's|^ARCH *.= ar|ARCMD = ar| ; \
>@@ -72,10 +65,8 @@
> 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/superlu_ug.pdf ${DOCSDIR}
> .endif
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
>-CFLAGS+=	-fPIC
>-.endif
>+regression-test: build
>+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} testing )
>+	@(cd ${WRKSRC}/TESTING && ${CAT} *.out )
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -ruN superlu.orig/files/patch-make.inc superlu/files/patch-make.inc
>--- superlu.orig/files/patch-make.inc	2008-06-19 17:38:56.000000000 -0500
>+++ superlu/files/patch-make.inc	2008-06-19 22:09:19.000000000 -0500
>@@ -1,5 +1,14 @@
>---- make.inc.orig	Sun Jan  1 18:52:00 2006
>-+++ make.inc	Sat Feb  4 19:25:37 2006
>+--- make.inc.orig	2006-01-01 18:52:00.000000000 -0500
>++++ make.inc	2008-06-19 22:08:49.000000000 -0500
>+@@ -19,7 +19,7 @@
>+ #
>+ TMGLIB       = libtmglib.a
>+ SUPERLULIB   = libsuperlu_3.0.a
>+-BLASLIB      = ../libblas.a
>++BLASLIB      = %%BLAS_LIBS%%
>+ 
>+ #
>+ #  The archiver and the flag(s) to use when building archive (library)
> @@ -29,12 +29,12 @@
>  ARCHFLAGS    = cr
>  RANLIB       = ranlib
>@@ -14,7 +23,7 @@
> +CFLAGS       = %%CFLAGS%%
> +FORTRAN	     = %%FC%%
> +FFLAGS       = %%FFLAGS%%
>-+LOADER       = %%CC%%
>++LOADER       = %%FC%%
> +LOADOPTS     = 
>  
>  #

Actions: View | Diff

Attachments on bug 124786: 88047