Attachment 164642 Details for Bug 205606 – patch

[patch] patch

suitesparse.patch (text/plain), 4.71 KB, created by Yuri Victorovich on 2015-12-25 19:38:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2015-12-25 19:38:12 UTC

Size: 4.71 KB

patch

obsolete

>Index: math/suitesparse/Makefile
>===================================================================
>--- math/suitesparse/Makefile	(revision 403379)
>+++ math/suitesparse/Makefile	(working copy)
>@@ -2,10 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	suitesparse
>-PORTVERSION=	4.0.2
>-PORTREVISION=	4
>+PORTVERSION=	4.4.6
> CATEGORIES=	math
>-MASTER_SITES=	http://www.cise.ufl.edu/research/sparse/SuiteSparse/
>+MASTER_SITES=	http://faculty.cse.tamu.edu/davis/SuiteSparse/
> DISTNAME=	SuiteSparse-${PORTVERSION}
> 
> MAINTAINER=	maho@FreeBSD.org
>@@ -46,6 +45,8 @@
> WRKSRC=${WRKDIR}/SuiteSparse
> WRKSRC_SHARED=${WRKSRC}_shared
> SVERSION=1
>+# random failures in multi-cpu build reported upstream
>+MAKE_JOBS_NUMBER=1
> 
> .if defined (WITH_METIS)
> METIS=${LOCALBASE}/lib/libmetis.a
>@@ -57,20 +58,21 @@
> 
> post-patch:
> 	@${FIND} -X ${WRKSRC} -type f -name 'Makefile' -or -name '*.mk' | ${XARGS} \
>-	${REINPLACE_CMD} -e '\|^AR =|s|ar|${AR}|' \
>-			-e '\|^BLAS =|s|=.*|= ${LDFLAGS} ${BLASLIB}|' \
>-			-e '\|^CC =|d' \
>-			-e '\|^CFLAGS =|{s|-O[1-9]\{0,1\}||g;s|=|= ${CFLAGS} $${PICFLAG} |;}' \
>-			-e '\|^CHOLMOD_CONFIG =|s|=.*|= ${CHOLMOD_CONFIG}|' \
>-			-e '\|^CPLUSPLUS =|s|=.*|= ${CXX}|' \
>-			-e '\|^F77 =|d' \
>-			-e '\|^F77FLAGS =|s|=.*|= ${FFLAGS} $${PICFLAG}|' \
>-			-e '\|^LAPACK =|s|=.*|= ${LDFLAGS} ${LAPACKLIB}|' \
>-			-e '\|^METIS =|s|=.*|= ${METIS}|' \
>-			-e '\|^METIS_PATH =|s|=.*|= ${METIS_PATH}|' \
>+	${REINPLACE_CMD} -i '' -E \
>+			-e '\|^[[:space:]]*AR =|s|ar|${AR}|' \
>+			-e '\|^[[:space:]]*BLAS =|s|=.*|= ${LDFLAGS} ${BLASLIB}|' \
>+			-e '\|^[[:space:]]*CC =|d' \
>+			-e '\|^[[:space:]]*CFLAGS =|{s|-O[1-9]\{0,1\}||g;s|=|= ${CFLAGS} $${PICFLAG} |;}' \
>+			-e '\|^[[:space:]]*CHOLMOD_CONFIG =|s|=.*|= ${CHOLMOD_CONFIG}|' \
>+			-e '\|^[[:space:]]*CPLUSPLUS =|s|=.*|= ${CXX}|' \
>+			-e '\|^[[:space:]]*F77 =|d' \
>+			-e '\|^[[:space:]]*F77FLAGS =|s|=.*|= ${FFLAGS} $${PICFLAG}|' \
>+			-e '\|^[[:space:]]*LAPACK =|s|=.*|= ${LDFLAGS} ${LAPACKLIB}|' \
>+			-e '\|^[[:space:]]*METIS =|s|=.*|= ${METIS}|' \
>+			-e '\|^[[:space:]]*METIS_PATH =|s|=.*|= ${METIS_PATH}|' \
> 			-e 's|-I\$$(METIS_PATH)/Lib|-I${METIS_PATH}|' \
>-			-e '\|^RANLIB =|s|ranlib|${RANLIB}|' \
>-			-e '\|^SPQR_CONFIG =|s|=.*|= ${CHOLMOD_CONFIG}|' \
>+			-e '\|^[[:space:]]*RANLIB =|s|ranlib|${RANLIB}|' \
>+			-e '\|^[[:space:]]*SPQR_CONFIG =|s|=.*|= ${CHOLMOD_CONFIG}|' \
> 			-e 's|# MAKE = gmake|MAKE = gmake|g' \
> 			-e 's|/usr/local|${LOCALBASE}|g'
> 	@${CP} -r ${WRKSRC} ${WRKSRC_SHARED}
>@@ -103,5 +105,6 @@
> 		$${i%.a}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib ; \
> 		j=$${i##*/} ;  ${LN} -sf $${j%.a}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/$${j%.a}.so ; \
> 	done
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.1
> 
> .include <bsd.port.mk>
>Index: math/suitesparse/distinfo
>===================================================================
>--- math/suitesparse/distinfo	(revision 403379)
>+++ math/suitesparse/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (SuiteSparse-4.0.2.tar.gz) = 93b5928987fe010808b3fdff3e7edef42fb2d8cfd65b09dd6d4c41756acb0050
>-SIZE (SuiteSparse-4.0.2.tar.gz) = 22421100
>+SHA256 (SuiteSparse-4.4.6.tar.gz) = 7f22509d87ada8506580d537efde79cf90e28e228355c18b8bf603aad1a2d7b6
>+SIZE (SuiteSparse-4.4.6.tar.gz) = 25627898
>Index: math/suitesparse/pkg-plist
>===================================================================
>--- math/suitesparse/pkg-plist	(revision 403379)
>+++ math/suitesparse/pkg-plist	(working copy)
>@@ -1,7 +1,7 @@
>-include/suitesparse/SuiteSparse_config.h
> include/suitesparse/SuiteSparseQR.hpp
> include/suitesparse/SuiteSparseQR_C.h
> include/suitesparse/SuiteSparseQR_definitions.h
>+include/suitesparse/SuiteSparse_config.h
> include/suitesparse/amd.h
> include/suitesparse/amd_internal.h
> include/suitesparse/btf.h
>@@ -11,11 +11,15 @@
> include/suitesparse/ccolamd.h
> include/suitesparse/cholmod.h
> include/suitesparse/cholmod_blas.h
>+include/suitesparse/cholmod_camd.h
> include/suitesparse/cholmod_check.h
> include/suitesparse/cholmod_cholesky.h
> include/suitesparse/cholmod_complexity.h
> include/suitesparse/cholmod_config.h
> include/suitesparse/cholmod_core.h
>+include/suitesparse/cholmod_function.h
>+include/suitesparse/cholmod_gpu.h
>+include/suitesparse/cholmod_gpu_kernels.h
> include/suitesparse/cholmod_internal.h
> include/suitesparse/cholmod_io64.h
> include/suitesparse/cholmod_matrixops.h
>@@ -29,6 +33,8 @@
> include/suitesparse/klu_internal.h
> include/suitesparse/klu_version.h
> include/suitesparse/spqr.hpp
>+include/suitesparse/spqrgpu.hpp
>+include/suitesparse/umf_config.h
> include/suitesparse/umfpack.h
> include/suitesparse/umfpack_col_to_triplet.h
> include/suitesparse/umfpack_defaults.h
>@@ -62,7 +68,6 @@
> include/suitesparse/umfpack_transpose.h
> include/suitesparse/umfpack_triplet_to_col.h
> include/suitesparse/umfpack_wsolve.h
>-include/suitesparse/umf_config.h
> include/ufsparse
> lib/libamd.a
> lib/libamd.so

Actions: View | Diff

Attachments on bug 205606: 164642 | 164703