Attachment #62171 for bug #93005

Lines 19-28 Link Here

(-)umfpack/Makefile (+16 lines)
19	WRKSRC= ${WRKDIR}/${DISTNAME}/UMFPACK	19	WRKSRC= ${WRKDIR}/${DISTNAME}/UMFPACK
20	ALL_TARGET= lib	20	ALL_TARGET= lib
21		21
		22	USE_REINPLACE= yes
		23	CBLAS_LIBS?= -lcblas -latlas
		24
22	post-extract:	25	post-extract:
23	${CP} ${WRKDIR}/${DISTNAME}/AMD/Make/Make.linux \	26	${CP} ${WRKDIR}/${DISTNAME}/AMD/Make/Make.linux \
24	${WRKDIR}/${DISTNAME}/AMD/Make/Make.freebsd	27	${WRKDIR}/${DISTNAME}/AMD/Make/Make.freebsd
25		28
		29	pre-build:
		30	@${REINPLACE_CMD} -e 's+%%CC%%+${CC}+g ; \
		31	s+%%CFLAGS%%+${CFLAGS}+ ; \
		32	s+%%BLASBASE%%+${LOCALBASE}+ ; \
		33	s+%%CBLAS_LIBS%%+${CBLAS_LIBS}+ ;' \
		34	${WRKDIR}/${DISTNAME}/AMD/Make/Make.freebsd
		35
26	do-install:	36	do-install:
27	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/AMD/Lib/libamd.a ${PREFIX}/lib	37	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/AMD/Lib/libamd.a ${PREFIX}/lib
28	${INSTALL_DATA} ${WRKSRC}/Lib/libumfpack.a ${PREFIX}/lib	38	${INSTALL_DATA} ${WRKSRC}/Lib/libumfpack.a ${PREFIX}/lib
Lines 46-50 Link Here
46	@${FIND} ${EXAMPLESDIR} \| ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}	56	@${FIND} ${EXAMPLESDIR} \| ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
47	@${FIND} ${EXAMPLESDIR} -type f \| ${XARGS} ${CHMOD} ${SHAREMODE}	57	@${FIND} ${EXAMPLESDIR} -type f \| ${XARGS} ${CHMOD} ${SHAREMODE}
48	.endif	58	.endif
		59
		60	.if defined(MAINTAINER_MODE)
		61	test: build
		62	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} $(MAKE) hb )
		63	.endif
		64
49		65
50	.include <bsd.port.mk>	66	.include <bsd.port.mk>




--- Make/Make.freebsd.orig	Sat Jan 14 17:09:34 2006
+++ Make/Make.freebsd	Sat Jan 14 17:13:14 2006
@@ -6,8 +6,8 @@
 # if you use the Intel compiler and the Fortran BLAS.
 
 # Using GNU gcc and f77 compilers:
-  CC = gcc
-  CFLAGS = -O3 -fPIC
+  CC = %%CC%%
+  CFLAGS = %%CFLAGS%% -fPIC
 
 # Using Intel's icc and ifc compilers:
 # F77 = ifc

 # 2: with the ATLAS C-BLAS (http://www.netlib.org/atlas).
-# CONFIG = -DCBLAS -I../ATLAS/include
-# LIB = -lcblas -latlas -lm
+CONFIG = -DGETRUSAGE -DCBLAS -I../ATLAS/include -I%%BLASBASE%%/include
+LIB = -L%%BLASBASE%%/lib %%CBLAS_LIBS%% -lm
 
 # 3: with Fortran interface to the ATLAS BLAS
-# CONFIG =
-# LIB = -lf77blas -latlas -lfrtbegin -lg2c -lm
+# CONFIG = -I%%BLASBASE%%/include
+# LIB = -L%%BLASBASE%%/lib -lf77blas -latlas -lfrtbegin -lg2c -lm
 
 # 4: with Fortran interface to the BLAS, and Goto's BLAS
-  CONFIG =

Return to bug 93005

Lines 1-13 Link Here

(-)umfpack/files/patch-Make+Make.freebsd (-8 / +8 lines)
1	--- Make/Make.freebsd.orig Fri Mar 18 22:29:13 2005	1	--- Make/Make.freebsd.orig Sat Jan 14 17:09:34 2006
2	+++ Make/Make.freebsd Fri Mar 18 22:30:13 2005	2	+++ Make/Make.freebsd Sat Jan 14 17:13:14 2006
3	@@ -6,8 +6,8 @@	3	@@ -6,8 +6,8 @@
4	# if you use the Intel compiler and the Fortran BLAS.	4	# if you use the Intel compiler and the Fortran BLAS.
5		5
6	# Using GNU gcc and f77 compilers:	6	# Using GNU gcc and f77 compilers:
7	- CC = gcc	7	- CC = gcc
8	- CFLAGS = -O3 -fPIC	8	- CFLAGS = -O3 -fPIC
9	+ CC ?= cc	9	+ CC = %%CC%%
10	+ CFLAGS ?= -O3 -fPIC	10	+ CFLAGS = %%CFLAGS%% -fPIC
11		11
12	# Using Intel's icc and ifc compilers:	12	# Using Intel's icc and ifc compilers:
13	# F77 = ifc	13	# F77 = ifc
Lines 17-30 Link Here
17	# 2: with the ATLAS C-BLAS (http://www.netlib.org/atlas).	17	# 2: with the ATLAS C-BLAS (http://www.netlib.org/atlas).
18	-# CONFIG = -DCBLAS -I../ATLAS/include	18	-# CONFIG = -DCBLAS -I../ATLAS/include
19	-# LIB = -lcblas -latlas -lm	19	-# LIB = -lcblas -latlas -lm
20	+CONFIG = -DCBLAS -I../ATLAS/include -I${LOCALBASE}/include	20	+CONFIG = -DGETRUSAGE -DCBLAS -I../ATLAS/include -I%%BLASBASE%%/include
21	+LIB = -L${LOCALBASE}/lib -lcblas -latlas -lm	21	+LIB = -L%%BLASBASE%%/lib %%CBLAS_LIBS%% -lm
22		22
23	# 3: with Fortran interface to the ATLAS BLAS	23	# 3: with Fortran interface to the ATLAS BLAS
24	-# CONFIG =	24	-# CONFIG =
25	-# LIB = -lf77blas -latlas -lfrtbegin -lg2c -lm	25	-# LIB = -lf77blas -latlas -lfrtbegin -lg2c -lm
26	+# CONFIG = -I${LOCALBASE}/include	26	+# CONFIG = -I%%BLASBASE%%/include
27	+# LIB = -L${LOCALBASE}/lib -lf77blas -latlas -lfrtbegin -lg2c -lm	27	+# LIB = -L%%BLASBASE%%/lib -lf77blas -latlas -lfrtbegin -lg2c -lm
28		28
29	# 4: with Fortran interface to the BLAS, and Goto's BLAS	29	# 4: with Fortran interface to the BLAS, and Goto's BLAS
30	- CONFIG =	30	- CONFIG =