Date: Mon, 20 Feb 2006 02:18:35 +0100 (CET) From: <pfgshield-freebsd@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/93005: Minor port enhancement to math/umfpack port Message-ID: <20060220011835.16269.qmail@web32901.mail.mud.yahoo.com> In-Reply-To: <200602080050.k180o28Y034254@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
ugh..sorry ofr submitting yet another patch, the original port actaully had
-fPIC for everycase. IMHO, this makes sense on amd64 but we shouldn't be adding
it for other architectures. Here is the revised patch:
diff -ruN umfpack.orig/Makefile umfpack/Makefile
--- umfpack.orig/Makefile Sun Dec 18 16:03:54 2005
+++ umfpack/Makefile Sun Feb 19 20:11:31 2006
@@ -19,10 +19,19 @@
WRKSRC= ${WRKDIR}/${DISTNAME}/UMFPACK
ALL_TARGET= lib
+CBLAS_LIBS?= -L${LOCALBASE}/lib -lcblas -latlas
+
post-extract:
${CP} ${WRKDIR}/${DISTNAME}/AMD/Make/Make.linux \
${WRKDIR}/${DISTNAME}/AMD/Make/Make.freebsd
+pre-build:
+ @${REINPLACE_CMD} -e 's+%%CC%%+${CC}+g ; \
+ s+%%CFLAGS%%+${CFLAGS}+ ; \
+ s+%%LOCALBASE%%+${LOCALBASE}+ ; \
+ s+%%CBLAS_LIBS%%+${CBLAS_LIBS}+ ;' \
+ ${WRKDIR}/${DISTNAME}/AMD/Make/Make.freebsd
+
do-install:
${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/AMD/Lib/libamd.a ${PREFIX}/lib
${INSTALL_DATA} ${WRKSRC}/Lib/libumfpack.a ${PREFIX}/lib
@@ -47,4 +56,15 @@
@${FIND} ${EXAMPLESDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
.endif
-.include <bsd.port.mk>
+.if defined(MAINTAINER_MODE)
+test: build
+ @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} $(MAKE) hb )
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "amd64"
+CFLAGS+= -fPIC
+.endif
+
+.include <bsd.port.post.mk>
diff -ruN umfpack.orig/files/patch-Make+Make.freebsd
umfpack/files/patch-Make+Make.freebsd
--- umfpack.orig/files/patch-Make+Make.freebsd Sun Dec 18 16:03:54 2005
+++ umfpack/files/patch-Make+Make.freebsd Sun Feb 19 20:12:34 2006
@@ -1,13 +1,13 @@
---- Make/Make.freebsd.orig Fri Mar 18 22:29:13 2005
-+++ Make/Make.freebsd Fri Mar 18 22:30:13 2005
+--- Make/Make.freebsd.orig Sun Feb 19 15:26:42 2006
++++ Make/Make.freebsd Sun Feb 19 15:29:05 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 ?= -O3 -fPIC
++ CC = %%CC%%
++ CFLAGS = %%CFLAGS%%
# Using Intel's icc and ifc compilers:
# F77 = ifc
@@ -17,14 +17,14 @@
# 2: with the ATLAS C-BLAS (http://www.netlib.org/atlas).
-# CONFIG = -DCBLAS -I../ATLAS/include
-# LIB = -lcblas -latlas -lm
-+CONFIG = -DCBLAS -I../ATLAS/include -I${LOCALBASE}/include
-+LIB = -L${LOCALBASE}/lib -lcblas -latlas -lm
++CONFIG = -DGETRUSAGE -DCBLAS -I../ATLAS/include -I%%LOCALBASE%%/include
++LIB = %%CBLAS_LIBS%% -lm
# 3: with Fortran interface to the ATLAS BLAS
-# CONFIG =
-# LIB = -lf77blas -latlas -lfrtbegin -lg2c -lm
-+# CONFIG = -I${LOCALBASE}/include
-+# LIB = -L${LOCALBASE}/lib -lf77blas -latlas -lfrtbegin -lg2c -lm
++# CONFIG = -I%%LOCALBASE%%/include
++# LIB = -L%%LOCALBASE%%/lib -lf77blas -latlas -lfrtbegin -lg2c -lm
# 4: with Fortran interface to the BLAS, and Goto's BLAS
- CONFIG =
___________________________________
Yahoo! Messenger with Voice: chiama da PC a telefono a tariffe esclusive
http://it.messenger.yahoo.com
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060220011835.16269.qmail>