View | Details | Raw Unified | Return to bug 242995 | Differences between
and this patch

Collapse All | Expand All

(-)cad/calculix-ccx/Makefile (-3 / +2 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	ccx
4
PORTNAME=	ccx
5
PORTVERSION=	2.16
5
PORTVERSION=	2.16
6
PORTREVISION=	1
6
CATEGORIES=	cad
7
CATEGORIES=	cad
7
MASTER_SITES=	http://www.dhondt.de/
8
MASTER_SITES=	http://www.dhondt.de/
8
PKGNAMEPREFIX=	CalculiX-
9
PKGNAMEPREFIX=	CalculiX-
Lines 16-24 Link Here
16
LICENSE=	GPLv2
17
LICENSE=	GPLv2
17
18
18
LIB_DEPENDS=	libarpack.so:math/arpack-ng	\
19
LIB_DEPENDS=	libarpack.so:math/arpack-ng	\
19
		libmetis.so:math/metis		\
20
		libspooles.so:math/spooles
20
		libspooles.so:math/spooles	\
21
		libtaucs.so:math/taucs
22
21
23
USES=		blaslapack compiler:openmp fortran gmake tar:bzip2
22
USES=		blaslapack compiler:openmp fortran gmake tar:bzip2
24
USE_PERL5=	build
23
USE_PERL5=	build
(-)cad/calculix-ccx/files/patch-Makefile (-4 / +4 lines)
Lines 1-10 Link Here
1
--- Makefile.orig	2019-11-25 17:54:53 UTC
1
--- Makefile.orig	2019-11-25 17:54:53 UTC
2
+++ Makefile
2
+++ Makefile
3
@@ -1,9 +1,9 @@
3
@@ -1,9 +1,10 @@
4
 
4
 
5
-CFLAGS = -Wall -O2  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
5
-CFLAGS = -Wall -O2  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
6
-FFLAGS = -Wall -O2 
6
-FFLAGS = -Wall -O2 
7
+CFLAGS += -O2 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT -DTAUCS
7
+CFLAGS += -O2 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT \
8
+	  -DUSE_MT=1
8
+FFLAGS += -O2 
9
+FFLAGS += -O2 
9
 
10
 
10
-CC=cc
11
-CC=cc
Lines 14-20 Link Here
14
 
15
 
15
 .c.o :
16
 .c.o :
16
 	$(CC) $(CFLAGS) -c $<
17
 	$(CC) $(CFLAGS) -c $<
17
@@ -21,12 +21,12 @@ OCCXMAIN = $(SCCXMAIN:.c=.o)
18
@@ -21,12 +22,11 @@ OCCXMAIN = $(SCCXMAIN:.c=.o)
18
 DIR=../../../SPOOLES.2.2
19
 DIR=../../../SPOOLES.2.2
19
 
20
 
20
 LIBS = \
21
 LIBS = \
Lines 21-27 Link Here
21
-       $(DIR)/spooles.a \
22
-       $(DIR)/spooles.a \
22
-	../../../ARPACK/libarpack_INTEL.a \
23
-	../../../ARPACK/libarpack_INTEL.a \
23
-       -lpthread -lm -lc
24
-       -lpthread -lm -lc
24
+	-ltaucs -lmetis \
25
+	-lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% \
25
+	-lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% \
26
+	-lpthread -lm
26
+	-lpthread -lm
27
 
27
 
(-)cad/calculix-ccx/pkg-descr (+4 lines)
Lines 10-12 Link Here
10
Results obtained from CalculiX are in no way connected to ABAQUS.
10
Results obtained from CalculiX are in no way connected to ABAQUS.
11
11
12
WWW: http://www.calculix.de
12
WWW: http://www.calculix.de
13
14
Spooles option: by default the single-threaded solver is used unless you
15
set the CCX_NPROC_EQUATION_SOLVER environment variable with the number of
16
cores you want to use.

Return to bug 242995